introduce calculator
Merge branch 'master' of github.com:magmuell/teamproject

merge needed