Projectile reorg
Merge and new projectile stuff (+ collisions!)

Conflicts:
	src/main.js