fixed shit
wq`Merge branch 'master' of https://github.com/shrig94/pokemon
battle