some fix...
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
fix some mistake ^^"