bug fix: capybarahelpers
create spec file to test Trip class, contains tests
This should just have two files with code to do ajax on new trip
and a controller that returns a JSON object -- still says there is no
create template after saving the trip, though
Created JS to allow for AJAX creation of trips
- Added the new script to application.html.erb
- Added code to accept AJAX request in trips_controller

Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into testing-trip-model1
change code to allow server to process AJAX requests
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog into testing-trip-model1
Merge branch 'master' of https://github.com/spring-peepers-2014/TravelBlog

Conflicts:
	spec/models/trip_spec.rb
Added User factory
Added presence true validation for title and body
- This was done to make the tests for post model tests to pass
Added empty photos_controller
Merge pull request #47 from missingno15/chores/new_factories_and_specs

Chores/new factories and specs
Merge pull request #48 from Lrmanfre/testing-trip-model1

Testing trip model1
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
Changed js to select id rather than all forms for ajax
Merge pull request #49 from nealfennimore/bug/js_trips

Changed js to select id rather than all forms for ajax
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