Merge conflicts
Merge branch 'master' of https://github.com/jaxoncreed/StarSpace
Tried to hook everything up. Conduct Ship errors