simplified and matched cpp functionality; broke other Tut_05 haskell files (for now)
simplified and matched cpp functionality; fixed rest of Tut_05 haskell files