ignore cabal-dev
Merge branch 'master' into answers