test commit

*modified rocks_20x16.png
Merge branch 'master' of https://github.com/mudogg/myHumans

Conflicts:
	bin/enviroment/World.class
	bin/game/screen/GameScreen.class
	bin/graphics/CHUNKS.class
Merge branch 'master' of https://github.com/tomfilipino/myHumans