more merge issues
Styling. Merge issues
Style merge conflcts
Background color style
717am
fix trips controller
Merge pull request #43 from MooreJesseB/master

Styling and bug fixes
shit
fix background color
final
Merge pull request #44 from MooreJesseB/master

fix background color
Merge pull request #45 from sbokaie/master

final
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Shawn Marge
Conflicts:
	app/views/sites/about.html.erb
	app/views/trips/index.html.erb
	app/views/trips/show.html.erb
Map update