fixed some stuff

yay stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	game.js