Super Star Trek initial commit of Ship and Shield
cleanup
Merge branch 'master' of https://github.com/AgileInstitute/Beta

Conflicts:
	src/test/java/MyUnitTest.java