merge
Merge branch 'master' of https://github.com/gerandreasmay/calculator.git