Merge branch 'master' into Leif
quick rocket change
Merge branch 'master' into Leif

Conflicts:
	entities/miscEntities.js
	entities/weapons.js
	resources.xml
minor config changes
Merge remote-tracking branch 'origin/master' into Leif
Merge branch 'master' into Leif
Moved stuff to config file
Config changes to Mine
Merge branch 'master' into Leif

Conflicts:
	entities/weapons.js
	main.js
Merge branch 'master' into Leif
Rocket blast moved to Config
delay fix
Merge branch 'master' into Leif

Conflicts:
	entities/weapons.js
	main.js
temp projectile
Merge branch 'master' into Leif
Merge remote-tracking branch 'origin/master' into Leif
Size Chnage again?
Added projectiles file, rocketWIP
Merge branch 'master' into Leif

Conflicts:
	entities/weapons.js
Wave Fix and Projectile WIP