uppdaterar lokala andringar
Merge branch 'onlyh' of github.com:Sebelino/Team18v2 into onlyh
gjort sa att deadlockdetektering anvands
Merge branch 'onlyh' of github.com:Sebelino/Team18v2 into onlyh