simple calculator
Merge branch 'master' of github.com:noam3127/example1