Commiting changes before merging.
Merge branch 'master' of https://github.com/xkings/PokemonTD
Getting all pieces together.