trying to fix errors
Merge branch 'master' of https://github.com/VirsixInc/ZombieRailShooter

Conflicts: