Merge branch 'trip' of github.com:timproctor/footprints into timproctor-trip
cleaning up indentation on trip_spec
adds validator for user_id & test
Tidies up trip_spec and test user/test relationship in user_spec
Merge branch 'polishing-trip'
feed
redirected to feed after sign in
Merge branch 'master' of github.com:MarcGarreau/footprints
Merge branch 'master' of github.com:MarcGarreau/footprints
Redirect to feed after sign in
Merge pull request #36 from timproctor/api

created api controller, trips, and posts controller,
Separates concerns with session controller
Tests the login post build method
Merge pull request #37 from MarcGarreau/testing-post-creation

Testing post creation
Add source to post
Displays a users posts in the feed
Reroutes user to feed after login
step one.
fixes merge conflict in schema
fixes broken trips_controller test