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
navbar fixes, moved login box inside
fixed bug where guest broke navbar
plane list styling
Merge branch 'master' into marcus
css fixes
form fixes
removed bug on form, datetime
Merge pull request #20 from MollyMoile/css

Css
fixed merge conflict on airplane form
airplanes controller tests working