Got rid of letter grade "E"
modified blog instructions
fixed merge conflicts
removed whitespace
merge with dbc

cking branch 'upstream/master'

# 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.