Updated Labb2 in Haskell @ progp13