Added calculator
Merge https://github.com/BBK-PiJ-2014-23/D3