Test commit
ok

Merge branch 'master' of https://github.com/Grimfor/RunningJoe

Conflicts:
	RunningJoe/bin/efficom/runningjoe/RunningJoe.class
	RunningJoe/bin/efficom/runningjoe/core/RjWorld.class