completed/unpolished
Merge branch 'keyboardCalc'