added calculator.html in server.js
Merge branch 'staging'