added dockerfile to haskell
conflict resolved?