asdf
Merge branch 'Leif' into master
improved projectile appearance
Merge branch 'Leif' into 'master'
fixed boomerang
black hole bug fix
Merge branch 'master' of https://github.com/LuckyMarq/collide

Conflicts:
	entities/projectiles.js
Merge remote-tracking branch 'origin/master' into Aaron