push
Merge remote-tracking branch 'origin/master'

Conflicts:
	SplitWorlds.pde
	build-tmp/SplitWorlds$GameObject.class
	build-tmp/SplitWorlds$Man.class
	build-tmp/SplitWorlds$Platform.class
	build-tmp/SplitWorlds.class
	build-tmp/source/SplitWorlds.java