BLARGH
Merge branch 'master' of http://github.com/bagedevimo/pxljm

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