graphics
merged
Merge branch 'master' of
https://github.com/qxu/pokemon-tower-defense.git

Conflicts:
	PokemonTD/src/com/github/qxu/ptd/tower/Type.java