Edited Ship
Merge origin/master
Merge origin/master
Merge origin/master
Temporarily made fuel usage 0 on move until we can implement refueling
Merge origin/master