Completed the calculator assignment
Merged .gitignore