Andy initial commit
fixed merge conflict
Merge branch 'master' of https://github.com/max888/CalcIt