Actually Works
Merge branch 'master' of https://github.com/tchordia/teamdhc

Conflicts:
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Copy
of RocketShipTest/.markers.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Copy
of RocketShipTest/.syncinfo.snap

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.s
nap

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.resources/.snap

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.ui.prefs
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers
.dat