Interim check in.
Add tactical submarine associate with attacking torpedo. Need to
revisit, unit need to move toward target when out of weapon range.
Torpedo should collide with target.
Merge branch 'issue41' into develop
Merge branch 'develop' of
https://github.com/gsnorton/CS-547-Project-Two.git into develop

Conflicts:
	atlantis/src/atlantis/AtlantisEntity.java
	atlantis/src/atlantis/MotherShip.java