fooooooooooooooooooooooooooo
Merge branch 'master' of https://github.com/bagedevimo/pxljm

Conflicts:
	eclipse/src/goldeneagle/scene/ChunkEntity.java