New commit
Merge branch 'master' of github.com:pspeder/DatVid-Assignments
sat sammen...(?)