calculator.js added
Merge origin/master