fjernet bar.txt i barbranch
hei
merged branch bar