Calculator js updates

Calculator equations and variables set up in calculator.js.
Some formatting changes made to the calculator in styles.css.
Merge remote-tracking branch 'origin/tb-calculatorcode'