Merge Sam's CSS updates

Merge branch 'master' into dev_luke
Merge branch 'master' into sambox

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

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

fixed flights views tests
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
fixed conflicts