update
Merge branch 'master' of https://github.com/glenwks/genshyft

Conflicts:
	test/game-app-test.js