added several functions to discrete functions class
merged functions.py
added .idea/workspace.xml
Merge https://github.com/PellelNitram/1a-Analysis
filled in x and y functions. Also added derivative functions.
Merge remote-tracking branch 'upstream/master' into matt
Changed some spaces and minor things.

- changed basically nothing.