templated a solid state machine
Merge branch 'master' of https://github.com/jtmac6/gdd2game

Conflicts:
	src/js/main.js