Adding FusionDrive to Aircraft class
Added Battleship to BoatType values
Post merge