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

Conflicts:
	eclipse/src/goldeneagle/scene/Entity.java
	eclipse/src/goldeneagle/scene/Scene.java
dont get your hopes up (yet)
Merge branch 'master' of https://github.com/bagedevimo/pxljm

Conflicts:
	eclipse/src/goldeneagle/entities/ChunkEntity.java
	eclipse/src/goldeneagle/entities/PlayerEntity.java
	eclipse/src/goldeneagle/entities/TreeEntity.java
Merge branch 'master' of https://github.com/bagedevimo/pxljm