Adding thumbnails in Javascript
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Jesse Merge
Conflicts:
	app/views/trips/show.html.erb
jQuery
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Jesse Merge
717am
last night changes
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
Merge pull request #43 from MooreJesseB/master

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

fix background color
minor changes
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
Merge pull request #46 from SalamanderMike/master

Map update
Merge conflict
merge conflict