merge
Merge branch 'master' of https://github.com/2340-Group/SpaceTrader

Conflicts:
	SpaceTrader/src/spacetrader/EventGeneratorSimple.java
	SpaceTrader/src/spacetrader/NAMEController.java
	SpaceTrader/src/spacetrader/NONAMEController.java
	SpaceTrader/src/spacetrader/SPAAACEController.java
	SpaceTrader/src/spacetrader/ShipTest_jrule3.java
Fix Conflict
uncommenting