Merge branch 'Leif' into Master
fuck the turret guy
Merge remote-tracking branch 'origin/master' into Aaron
fixed the shooter guy.
Merge branch 'master' into Leif

Conflicts:
	entities/enemies3.js
	entities/map.js
	entities/menus.js
	entities/projectiles.js
	game.html
	main.js
	values/map.xml