GlazerCalc Version 2

Calc with additional tests
Merge branch 'master' of https://github.com/beardybutler/YellowBook