updating readme
creating user tests and specs
making rspec test actually fail and not give error
user creation feature test passing
basic setup for photos and feeds
fix merge conflicts
add trips model and tests
Added trip form
creating dashboard with recent trips and finishing specs
creating trip spec for visitor
Added basic authentication for PhotosAPI.  Connect and Callback routes for PhotosController.  Added table for FeedSources.
added Twitter OmniAuth
creating twitter login... WIP failing specs and tests
finishing specs and test for login
completing stories with app description
adding twitter button
completing tests and specs for login
omniauth tests pass
Merge pull request #1 from bwinterling/trips

merging trip branch into staging after Brian reviewed
Fixed merge conflicts for merge of Trips into Staging