changed search to GET, removed search_results route
added jquery.turbolinks gem, required in application.js
removed turbolink from new tour link in navbar
moved search box on new tour map, changed id to differentiate between searchbox on landing page
added searchbox to results map
changed placeholders
merge conflict resolved
Merge pull request #71 from jpark3000/map_debugging

Map debugging
remove turbolink to new tour
Merge pull request #72 from jpark3000/remove_turbolink_to_new_tour

remove turbolink to new tour
remove turbolink to new tour
Merge branch 'master' into contact_modal

Conflicts:
	Gemfile.lock