added calculator.html!
Merge branch 'staging'