Rid ID, change .equals()
Something happened. I forget.
Working on GameLoader, to remove loading from Game.
GameLoader copied what it needed to, made it work w/ WG, now to tidy it up and plug it in.
Merge branch 'master' into WorldGen

Conflicts:
	Game/src/com/thecolony/tractus/graphics/game/Game.java
Hopefully this works OK
Most things work.
No hierarchy of objects yet, currently, resFile paths are incorrect.
Merge branch 'master' into WorldGen

Conflicts:
	Game/src/com/thecolony/tractus/graphics/game/Game.java
Merge branch 'WorldGen'
Merge branch 'master' of https://github.com/CS-196-Space-Colonization/Game