collision
shooting fixed
Merge branch 'master' of https://github.com/Chase-C/CDSV-Rogue
movement in the room