changed seeds file to fix validaiton issue
Merge branch 'master' into sambox
Added Backbone.js Router, FlightListItemView. Added collections and models for Flight, and updated AppView
Updated Pages Index with DOM containing Search Input and Button.
views for flights, modified form for flight, added admin access to flights and planes pages
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 pull request #18 from MollyMoile/sambox

Admin access, flights index page
fixed conflicts
navbar fixes, moved login box inside
fixed bug where guest broke navbar
plane list styling
Merge branch 'master' into marcus
Added Flight Listing using Backbone (Working).
css fixes
form fixes
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
removed bug on form, datetime
Merge pull request #20 from MollyMoile/css

Css