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

Conflicts:
	eclipse/src/goldeneagle/InitGameState.java
	eclipse/src/goldeneagle/TestGameState.java