Merge branch 'master' into places
Merge branch 'master' into places
gems for mapbox
Merge branch 'master' into places
added map to trips show page
added map to trips show page
Merge pull request #17 from mpvazquez/places

Added a map to Trips Show Page