game play
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.js
Merge branch 'master' of https://github.com/Brolita/GameDevProject2
gotta get pulls
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Brolita/GameDevProject2