Rowan Miller 9a411df59f Merge branch 'release' into dev ... # Conflicts: # src/PageGenerator/project.json		2016-05-10 12:34:53 -07:00
..
PageGenerator.xproj	…
Program.cs	…
project.json	Merge branch 'release' into dev	2016-05-10 12:34:53 -07:00