edited map
Merge branch 'master' of github.com:shrig94/pokemon
battle setup