Create test1.md
Merge branch 'master' of https://github.com/Rrego6/space_traders into sarah
edited css files by sarah
edited fxml file by sarah
edited fxml file by sarah
edited ui files by sarah
i Edited Css and fxml files
edited ui files by sarah
edited ui files by sarah
Merging Sarah
Merge branch 'master' of https://github.com/Rrego6/space_traders
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan
Refactored SpaceTraders Code. Make sure to Pull
res is now seperate from src. Added Planets.txt
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan
Updated the javadoc for Planet, SolarSystem, and Universe.
Created toString() methods for SolarSystem and Universe
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan