Added Backbone.js Router, FlightListItemView. Added collections and models for Flight, and updated AppView
Updated Pages Index with DOM containing Search Input and Button.
Added Backbone Router Instantiation in App.js with Big Help
Added Flight Listing using Backbone (Working).
homepage changes
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
Merge Sam's CSS updates

Merge branch 'master' into dev_luke
Merge pull request #22 from MollyMoile/marcus

Great job on the testing, Marcus!
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
Merge branch 'master' into sambox

Conflicts:
	app/controllers/pages_controller.rb
	app/views/pages/index.html.erb
Merged updates from master

Merge branch 'master' into dev_luke
Merge branch 'master' into marcus
Merge pull request #24 from MollyMoile/marcus

fixed flights views tests
Merge branch 'master' into marcus
Merged Marcus Spec

Merge branch 'master' into dev_luke
Added Posx and Posy to Seats
Merge pull request #25 from MollyMoile/dev_luke

Dev luke
Merge branch 'master' of https://github.com/MollyMoile/burning-airlines into marcus
formatting