Update & added to Ship
Merge branch 'master' of https://github.com/cathaldcronin1/Space-Impact

Conflicts:
	SpaceImpact/SpaceImpact.csproj
Added content manager to factory