fuck me
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from kevinhehehehe/master

fixed projectile stuff