rspec
Merge branch 'development'
fixed specfile
resolved flight.rb conflict
rspec for airline