merge
aktueller stand
parser
:Merge branch 'master' of https://github.com/santifa/haskell-seminar
calculon angepasst