edited show page in trips
added search controller, search route, and search index
added trips index as the root
added search bar to home page and functioning for trips only
added markers and users to search
merged with master containing devise
Merge branch 'master' into uploader
added file check on photo_picture uploader