changed seeds file to fix validaiton issue
Merge branch 'master' into sambox
views for flights, modified form for flight, added admin access to flights and planes pages
Merge pull request #18 from MollyMoile/sambox

Admin access, flights index page
Add css and a template in pages/index.html.erb
fixed conflicts
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