asd
asd
asdasd
asdasda
merged
for merging with working
Merge branch 'working'
asdasdad
asdasdad
pulled
merged lokal
asdasda
pulled from master
asda
fdf
fixed merge
fixed
sdfsf
Merge branch 'master' into working
la til noe greier...