Some more changes...
Merge branch 'master' of https://github.com/iammadsnielsen/ucn-4semproject-dm79-group2.git