Implemented load/Save, wrote out most of shipGen
Merge remote-tracking branch 'origin/master'