added name
Merge branch 'master' of https://github.com/DorianGregory/Mustang

Conflicts:
	App/game.js