Resolved Github Nonsense
Merge branch 'master' of https://github.com/enricozb/Split-Worlds

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