added a map on user_edit_path, can place markers on click
added searchbox with autocomplete functionality
conflict merge resolve
new map branch
added google map to new_tour_path, can search within it, add add a pointer
Merge pull request #12 from jpark3000/maps

Maps