merging the merge
Merge branch 'master' of github.com:slindley/dependent-haskell