works on phone splash
deletes extra phone sized images
updates marketing-old-id.css to match marketing.cs
inserts logo to header
Merge branch 'ad-carousel-trips-4.7'
logos, header formatting
updating content in footer, safety
Merge branch 'ad_4.10'
Merge pull request #8 from DenglSteel/adam-steel

Adam steel
deletes line of unnecessary comments
Merge branch 'master' of https://github.com/DenglSteel/coElv2

Conflicts:
	app/views/trips/show.html.erb
commits adams changes - deleting files

assets/javascripts/users.js.coffee
views/order_items/_form.html.erb
views/orders/_form.html.erb
Merge branch 'master' of https://github.com/DenglSteel/coElv2

Conflicts:
	db/schema.rb
Merge branch 'master' into adam-steel