merged master and moving
Merge branch 'master' of https://github.com/MisterPup/dummy-shooter.git