made adjustments to config/locales/en.yml regarding default date format
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
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
Merge pull request #108 from dheckman/master

added discover search to nav bar if not on home page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru