Done P89
Merge branch 'master' of github.com:simongibbons/pe_haskell