Merge branch 'master' of github.com:jorgenfar/TDT4200
Merge branch 'master' of github.com:jorgenfar/TDT4200