updates to battle logic
Merge branch 'master' of https://github.com/shrig94/pokemon