limited note return on discover page to 5 notes and set them to inline-flex so they take width of page but can reduce down too.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
fixed where X for deleting rambles wasn't being removed when ramble was
notes section on discover page is just about finalized -- green background, limited to 5 notes, made other needed adjustments for it to look good. inline-block
added no results returned when note search count is 0
styling/placing of no results
Merge pull request #162 from dheckman/master

workaround on user avatar errors, formatted notes on note search page, edited highlight color of note creation and deletion
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
merge conflicts
Merge pull request #163 from Noahhh/master

fixed where X for deleting rambles wasn't being removed when ramble was, and added text when no results were found for a note search.
minor commit before pulling down
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/discovers/show.html.erb
made an adjustment to styling for when no search results are found in notes search
tiny update to ramble copy
merge conflict
Merge pull request #164 from gregburton/master

major adjustments to how notes are display on discover page (limited to 5, removed show/hide, made background green, set to display inline-block). Made adjustment to styling for when note search returns nothing.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
updated note search format if user isn't logged in
fixed syntax eax error in note search that wasn't displaying address
added a few lines to config production for heroku