Started doing the battle stuff
Merge branch 'master' of https://github.com/mak001/java-pokemon