Changes in structure. Added the last of the discrete values, and renamed some
Merge branch 'master' of https://github.com/madsxp/DM-GROUP-PROJECT