working on getting pins loaded onto the map
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into feature/place-marker-when-trip-name-or-location-is-submitted
now loads pins associated with a trip
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into feature/place-marker-when-trip-name-or-location-is-submitted

Conflicts:
	app/controllers/trips_controller.rb
Merge pull request #58 from Lrmanfre/feature/place-marker-when-trip-name-or-location-is-submitted

Feature/place marker when trip name or location is submitted
Changed reference on map_id from current_user to 1
Merge pull request #59 from Lrmanfre/master

Changed reference on map_id from current_user to 1