connected pages
Merge branch 'master' into gmaps
full map with top padding
tweaked thumbnails
fixed conflicts
cleaned up js map files
added merged files
delete trips/create.html.erb