first commit
Merge https://github.com/jgwil2/calculatrice