Merge branch 'master' into Vegard's-Branch
Merge branch 'master' into Vegard's-Branch
Merge branch 'Vegard's-Branch'
Merge branch 'master' of https://github.com/vegather/KTN-Project