Updated Ship and Weapon to have Dump Method
Merge remote-tracking branch 'origin/M5Branch' into M5Branch

Conflicts:
	SpaceTrader/src/spacetrader/Ship.java