second commit
Merge branch 'master' of github.com:egong/calculator