Merge branch 'master' of https://github.com/mmcguill/haskell-2048