Pretty sure I don't have local changes
Merge branch 'master' of http://github.com/jakedarling/magicflight

Conflicts:
	magicflight/src/com/magicflight/jakedean/WorldChunk.java