hooray!fixed classpath nonsense
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamejam/.classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamejam/src/Engine/GameInstanceController.java