Fixed a collision bug
Merge branch 'master' of ssh://github.com/Senney/CPSC599-RPG