Merge pull request #66 from robobenklein/master

Update calc.js
Merge pull request #67 from robobenklein/gh-pages

Merge pull request #66 from robobenklein/master