-Bugfix to the haskell edition of my 1.3.1.. notes
-My work for 1.3.4 and 2.1.1
Merge branch 'master' of github.com:CompSciCabal/SMRTYPRTY

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