added calculator
major changes
Merge branch 'master' of https://github.com/techlabeducation/java