add name checking
Merge origin/master
draws range circle (no functionality) on map, clears canvas when necessary
Merge origin/master
make distance computation actually take into account solar system coordinates
javadocs
fix some spacing, remove some unsused imports and variables
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Fixed button alignment and cargo/credit label text
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
	SpaceTrader/src/spacetrader/Market.fxml
	SpaceTrader/src/spacetrader/Ship.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
	SpaceTrader/src/spacetrader/Market.fxml
	SpaceTrader/src/spacetrader/Ship.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
	SpaceTrader/src/spacetrader/Market.fxml
	SpaceTrader/src/spacetrader/Ship.java
Made confirmation save cargo and back remove changes

Also implemented price consistency within one instance of a market