memeogram
added a test
testing

nch 'master' into memeogram

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
some up dates
some up dates
another
another
another
Quick edit