Add Calculator class
Merge branch 'refactor'