skal merge med working
Merge branch 'working'
endret graph