users controller, there is not much to it, unless im missing something
Merge branch 'master' into marcus
navbar fixes, moved login box inside
fixed bug where guest broke navbar
plane list styling
Merge branch 'master' into marcus
css fixes
form fixes
homepage changes
removed bug on form, datetime
Merge pull request #20 from MollyMoile/css

Css
Merge Sam's CSS updates

Merge branch 'master' into dev_luke
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
Merge branch 'master' into sambox

Conflicts:
	app/controllers/pages_controller.rb
	app/views/pages/index.html.erb