Refaktoriserat i acceptanstest 9
Fixede mergeconflicts
Merge branch 'master' of github.com:Meldanya/pvg-vt13-team03