Added some calculations in datamanger for discrete values
Merge branch 'master' of https://github.com/madsxp/DM-GROUP-PROJECT