Templates set up for random events in data/readers
Removed unused imports @ PlanetController.java
Catch up
Merge remote-tracking branch 'origin/master' into james/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/PlanetController.java
Removed unused imports @ PlanetController.java
Updated to add Dock @ planet.fxml
Updated to add Dock & updated the code for better readability @
PlanetController.java
Initial dock template commit (from shipyard) @ dock.fxml
Random Events are now occurring...all the time...with no text on the screen.
nbproject properties
Merge branch 'master' into jack/dev
nbproject properties