Gnat file working properly.
How do branches work.
Fixed "unmappable character for encodingMS949" error @
root/Universe.java
started implementing layout of universe
Merge branch 'master' into jack/dev
Changed Gnat to Vagabond.
Merge branch 'master' into sam/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/Vagabond.java

Merge to get javadocs on all classes.
Added a bunch of new ships.
Fixed syntax errors.
Merge branch 'master' of https://github.com/gem-5/last-adventures into jack/dev

merging master into jack/dev
Added new Ship classes.
Merge remote-tracking branch 'origin/master' into james/dev
Merge remote-tracking branch 'origin/master' into james/dev
Added "back" button to status screen
Adding submission versions of domain model
Universe generation functional. Needs to be cleaned up and Solar Systems need tech levels and special resources.
added attributes to the content model
Added NameGenerator to create people/planet names.
Fixed parameter name for initialize(URL, ResourceBundle) to match the
javadoc @ TitleController.java
Cleaned up the Universe and SolarSystem code