new calc.js file
Merge branch 'master' of https://github.com/r0fls/forfun