NEW ENEMY!! SHOOTING GUY!!!!!!!!!!!!
new sound... PEW
Merge branch 'master' into Leif

Conflicts:
	entities/enemies.js
Removed Clutter
Merge branch 'Leif'
Fixed player explosion bug, Moved All explosions to miscEntities
Merge branch 'master' into Leif
added bullet

some people think they can outsmart me, Ive yet to meet one that can
outsmart bullet
fixed input in chrome
added rocket keyframe and other minor changes
added level ender and config for maps
quick rocket change
Merge branch 'master' into Leif

Conflicts:
	entities/miscEntities.js
	entities/weapons.js
	resources.xml
minor config changes
Merge branch 'Leif' into 'master'
improved wave visual
Merge remote-tracking branch 'origin/master' into Leif
lots of changes

improved appearance of explosions and particles
moved weapon pickups to pickups.js and deleted its file
removed old code building and rebuilding the map
added tinting to the basic shader
cleaned up some old code
Merge branch 'master' into Leif