add features specs for planes
fix models/planes.rb merge confict
fix merge conflics
fix merge conflics
fix merge conflics
fix merge conflics
rspec fixes
rspec fixes