eh
Merge branch 'master' of https://github.com/Dr-Jerm/nmGameJam2013

Conflicts:
	app/js/game.js