pulled and pushed
Merge branch 'master' into lokal
Merge branch 'master' into lokal
asd
addf
Merge branch 'working'
asd
sadasd
merged
sdfsdf
Merge branch 'working'
sfsf
sdfsd
Merge branch 'master' into working
fixed litt paa model 2
asd
asd
merged
sdfsdf
Merge branch 'master' into working