fuck you git
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
fix operator= from bullet