Did some stuff. Lost gorram work.
Some bug fixes. 1 left.
No infinite files.
Serializable
Refactored classes to prep merge with master
Refactored classes to prep merge with master
Merge branch 'master' into WorldGen

Conflicts:
	NotesToStuff
	Runner.java
	SpatialEntities/Cluster.java
	SpatialEntities/Continent.java
	SpatialEntities/Planet.java
	SpatialEntities/PlanetType.java
	SpatialEntities/Sector.java
	SpatialEntities/Star.java
	SpatialEntities/StarSystem.java
	SpatialEntities/Territory.java
	resources/Res.java
Merge branch 'WorldGen'

Get WorldGen to live with other people. TODO: merge it with everything else.