fixed conflict problems
Merge branch 'master' of https://github.com/kvillert/Grupp1