Update README
Update calc.js
Merge pull request #1 from linkalum/ClassmateBranch

Classmate branch