bug fix: capybarahelpers
create spec file to test Trip class, contains tests
Added pending photo controller test, added photo controller
Added and edited factories
- Created location_pin factory
- Created map factory
Added presence validtation to title and body
Passing post validation tests
Made trip model tests pending
Add posts_controller actions
Merge in chore/specs_and_factories with posts_controller tests
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into feature/create_view_blog_posts
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into feature/create_view_blog_posts
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
Deleted minified bootstrap as was unneeded

- Modified index to use bootstrap list elements and styling
- Made each trip link to it's show page
Merge pull request #50 from nealfennimore/master

Deleted minified bootstrap as was unneeded
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog

Conflicts:
	app/views/trips/index.html.erb