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 pull request #150 from gregburton/master

removed location scaffold, set API links to _blank, adjusted instagram count down to alleviate issue with too many pagination links, some other odds and ends
merge conflicts
reformatted nav bar
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