Added Backbone.js Router, FlightListItemView. Added collections and models for Flight, and updated AppView
Updated Pages Index with DOM containing Search Input and Button.
users controller, there is not much to it, unless im missing something
Merge branch 'master' into marcus
Added Backbone Router Instantiation in App.js with Big Help
Merge branch 'master' into marcus
Added Flight Listing using Backbone (Working).
Fixed Flight Listing Backbone. Disabled Admin only access to Flights. Removed Flights JBuilder View to eliminate JSON conflict

Merge branch 'master' into dev_luke

Conflicts:
	app/assets/javascripts/backbone/app.js
	app/assets/javascripts/backbone/router.js
	app/assets/javascripts/backbone/views/AppView.js
	app/controllers/flights_controller.rb
	app/views/pages/index.html.erb
removed bug on form, datetime
Merge pull request #20 from MollyMoile/css

Css
Merge branch 'master' into sambox
fixed merge conflict on airplane form
airplanes controller tests working
Merge pull request #22 from MollyMoile/marcus

Great job on the testing, Marcus!
fixed flights controller tests, added valid and invalid attributes
Merge pull request #23 from MollyMoile/marcus

fixed flights controller tests, added valid and invalid attributes
Merge branch 'master' into dev_luke

Conflicts:
	app/controllers/pages_controller.rb
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines
fixed conflicts