null
Merge branch 'master' of https://github.com/GoodGameIndustries/SpaceCraft-v1.0

Conflicts:
	SpaceCraft/SpaceCraft 1.0/bin/AI/AI.class
	SpaceCraft/SpaceCraft 1.0/bin/Ships/GatherShip.class
	SpaceCraft/SpaceCraft 1.0/src/AI/AI.java
Merge branch 'master' of https://github.com/GoodGameIndustries/SpaceCraft-v1.0

Conflicts:
	SpaceCraft/SpaceCraft 1.0/bin/AI/AI.class
	SpaceCraft/SpaceCraft 1.0/bin/Ships/GatherShip.class
	SpaceCraft/SpaceCraft 1.0/src/AI/AI.java
	SpaceCraft/SpaceCraft 1.0/src/Ships/GatherShip.java