pulled and pushed
Merge branch 'master' into lokal
Merge branch 'master' into lokal
asd
asd
sadasd
merged
fixed litt paa model 2
asd
asd
merged