Merge pull request #3 from LennyPenny/master

Z Xcsdfv wes
Anti-prop nocollide
Merge pull request #37 from DaaOtt/master

Anti-Anti-Proppush