datamodel
Merge branch 'master' of https://github.com/ulrikdamm/Bachelorprojekt