made adjustments to config/locales/en.yml regarding default date format
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
fixed menu bar bringing page to top when clicked
Merge pull request #102 from dheckman/master

bug fix - took out conditional user_id statement for notes show, wasn't ...
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added frontend to my about
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
user show page was broken
Merge pull request #105 from Noahhh/master

Fixed menu bar bringing page to top when clicked/user show page was broken
fixed conflict breaking ramble controller
Merge pull request #106 from Noahhh/master

fixed conflict breaking ramble controller
fixed a bunch of merge conflicts manually. not sure why I wasn't prompted to fix them. had to search for >>>
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/controllers/rambles_controller.rb
added desination label back to note results on notes search page
added gif hiding to about page
added discover search in nav bar if not on home page
Merge pull request #107 from gregburton/master

Added destination label back to note results on notes search page; added gif hiding to about page
merge conflict in ramble show