enemy collision
Merge branch 'Background' into wes

Conflicts:
	goodgame.html
	js/Player.js
	main.js
Merge branch 'master' of github.com:wesleytsai/goodgame into wes

Conflicts:
	goodgame.html
	main.js