fixes merge conflict
Merge branch 'master' of github.com:coreyd303/feed_engine_rails into twitter
fixes merge conflict
fixes merge conflict
changes db setting
Merge branch 'master' of github.com:coreyd303/feed_engine_rails into twitter
displays trips on trips index page
sorts all trips by date
reformats trip dates
adds search box to navbar
search functionality finds users
Merge pull request #40 from coreyd303/trips-index

Trips index, users search