added collision to battle maps
added more collisions and changed some tiles
Merge branch 'master' of https://github.com/Senney/CPSC599-RPG