dammit
blah
Merge branch 'master' of https://github.com/kikiotsuka/Pokemonsters

Conflicts:
	Monster.java