Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
working on tag search page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
merge conflicts
removed Dani's pic from the root and deleted an unused js map file
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #151 from dheckman/master

reformatted nav bar
changed discovers url to be discover
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
changed URL for rambles to ramble
added 'note' to search on menu bar
removed what was on notes/index
Merge pull request #152 from Noahhh/master

Changed URL name for discover and Ramble, and added "note" before "search" on menu bar, because "search" alone was confusing.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
got foursquare section of ramble page to copy text into note and allow for pagination \o/
Merge pull request #153 from gregburton/master

\o/ got pagination & copying API content into not to work for foursquare section of ramble page \o/
prettier flash messages
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru