Got templates working
Merge branch 'master' of https://github.com/jdehlin/ITS-Hackday1

Conflicts:
	package.json
Updated project name