Merge branch 'jk' of https://github.com/kazukimatsu/Calculator
Merge branch 'master' of https://github.com/kazukimatsu/Calculator
a