styling
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge
late night
a
Merge pull request #40 from sbokaie/master

styling
Here we go with big late night tired merge
Massive merge
Merge pull request #41 from MooreJesseB/master

Merging all night long!
128am
131am
239am
Merge pull request #42 from sbokaie/master

grids not perfect
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Late night merge on last night
Conflicts:
	app/controllers/trips_controller.rb
	app/views/sites/index.html.erb
	app/views/trips/index.html.erb
	app/views/trips/show.html.erb
Last late night merge from team