working on fixing double notes
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
fixed merge conflicts
merged from dani
working on routing
link_to working, form needs correct arguments
Merge pull request #58 from gregburton/master

See show page of a given location for geocoder - API connection progress
note edit working
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added rails modal gem and popout form for ramble page, as well as the ability to save instagram photos to ramble
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
modified location controller and view to only display notice once
Merge pull request #59 from dheckman/master

	modified location controller and view to only display notice once
note edit/delete working
merged
Merge pull request #60 from Noahhh/master

Edit/Destroy working for notes
saving changes to locations show page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
created discover model. Added destination, latitude, longitude to discovers table; added latitude, longitude to rambles table.