updated game.js for heroku deploy
Merge branch 'master' of heroku.com:shiftmaster

Conflicts:
	public/javascripts/game.js