Final Commit
Merge https://github.com/craggoo/Calculator