passing in reservations and users info through flights_controller
"passing in users and reservations info through flights_controller"
Merge branch 'user'