fix1
Merge branch 'master' of https://github.com/trevormcg/JackTemplate

Conflicts:
	ConsoleApplication3/Program.cs