Adding new RubberBang engine type to Aircraft class.
Resolving merge conflicts in Aircraft.cs