Merge branch 'master' of E:\Projects\Java\SpaceHackathon2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/twopeople/race/World/Loader/WorldLoader.java
world parsing part 8
Merge remote-tracking branch 'origin/master'