Overwrite moving object's move method in ship; need to debug friction for an issue involving rounding errors
Minor updates
Merge with origin