Updated calculator.py
Massive overhaul of calculator.py, adding extensive argumentation and
better/working implementation of an intrgral function