Projectile collision detection

* Fixed testing, this is not 100% complete
Merge branch 'master' of https://github.com/Malow/NotDeadYet