Danny Gonzalez
RangeChart is fully primed
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/Player.java