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
fixed merge confilcts
Merge branch 'master' of github.com:MarcGarreau/footprints
Added real feed with the right design
post controller
Added trip index page
added index and show view for trips
Merge horacio and tim's trip crud
Merge pull request #50 from MarcGarreau/trip-merger

Trip merger