Calcit file
Calculator
Merge branch 'master' of github.com:elliottjam/Calulator