add search bar in navbar
added bootstrap 3 and bootstrap js
Merge branch 'master' into bootstrap
Merge branch 'master' into searching
fixed trip creation bug preventing user from being saved
reworked bootstrap navbar
removed bootrap.js
Merge branch 'searching'
Merge branch 'master' into fixing_trips
created partials folder and new_marker partial
added bootstrap javascript file
created basic trip interface with no ajax, modified trip controller accordingly
started styling on interface
Merge branch 'master' into trip_interface
functioning search on home page
additional changes to css and views
made search results lists and links
added homepage js
additional tweaks to views and css
merged with master