save/restore bug on ship fixed
Merge branch 'master' of https://github.com/bluewish07/EECS381_p6