Minor fixes and reformating.
Merge branch 'master' of https://github.com/xkings/PokemonTD