merge test
Merge branch 'master' of https://github.com/maxia/jpoke.git

Conflicts:
	bin/pokemon/Main.class
	src/pokemon/Main.java