Interim commit. Switch to issue59
Merge branch 'issue54' into develop
Resolve issue59.
Merge branch 'issue59' into develop
Merge branch 'develop' of
https://github.com/gsnorton/CS-547-Project-Two.git into develop

Conflicts:
	atlantis/src/atlantis/MotherShip.java
Resolve issue54.