Merged the two branches

Joe's branch and master's branch were merge.  The probA-haskell branch
should now be deleted.
Merge branch 'master' of https://github.com/acm-ndsu/competitions