please
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Brolita/GameDevProject2

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