merge attempt
Merge branch 'master' of https://github.com/sp0ngey/TripApp

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb