First commit
Merge branch 'master' of https://github.com/karlkyn/calculator
First merge of local to remote