Fix to syntax
Merge branch 'master' of https://github.com/Brolita/GameDevProject2
more updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/game.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/game.js
hitbox drawn now