I think I forgot a final commit..........
Merge branch 'master' of github.com:benwang/Calculator2