Fixed the issue when damage happens before torpedo hits target.
Merge branch 'issue58' into develop
Tweak issues.mkd
Merge branch 'develop' of
https://github.com/gsnorton/CS-547-Project-Two.git into develop

Conflicts:
	atlantis/issues.mkd