bug fix: capybarahelpers
create spec file to test Trip class, contains tests
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog

Conflicts:
	spec/models/trip_spec.rb
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
fix conflict on trip_spec.rb
Merge pull request #2 from Lrmanfre/feature/ajax-append-trip-name-to-sidebar

Feature/ajax append trip name to sidebar
Because I don't need this right now.
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog

Conflicts:
	app/views/trips/index.html.erb
Can now create trip from sidebar

-The name of the trip will be appended
-Model creates work well
-Href of the new entry is correct upon refresh (not sure why)
-Still need to return the form submission to a New Trip link
now the form disappears and link reappears after adding a trip
now the location_pin takes the current trip as its ID
Merge pull request #51 from Lrmanfre/feature/make-NewTrip-reappear-in-sidebar

Feature/make new trip reappear in sidebar