Writing object type classes for rts, added full asset loading, not yet
linked to rts procedural generators
Patched a few things for the generator to sort of fit, but still lots of
bugs in that part. NEED THAT COMPLETED AND BUGLESS FAR BEFORE NEXT
WEDNESDAY!

Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/RTS/Building.class
	workspace/Manifest Destiny/bin/RTS/RTSObject.class
	workspace/Manifest Destiny/bin/RTS/Team.class
	workspace/Manifest Destiny/bin/RTS/Unit.class
	workspace/Manifest Destiny/bin/RTS/Units/Worker.class
	workspace/Manifest Destiny/bin/Worlds/RTSWorld.class
	workspace/Manifest Destiny/bin/loads/neighbors.txt
	workspace/Manifest Destiny/bin/loads/planets.txt
	workspace/Manifest Destiny/bin/loads/species.txt
	workspace/Manifest Destiny/bin/loads/specieslocation.txt
	workspace/Manifest Destiny/src/Generator/RTSGenerator.java
And added viro's extra stuff committed during my merge

Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/RTS/Team.class
	workspace/Manifest Destiny/bin/loads/neighbors.txt
	workspace/Manifest Destiny/bin/loads/planets.txt
	workspace/Manifest Destiny/bin/loads/species.txt
	workspace/Manifest Destiny/bin/loads/specieslocation.txt