Added world.java to store players and level data.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/gregswebserver/ld28/game/level/Level.java