Settings inställningar

inte helt klart
Merge remote-tracking branch 'origin/Kajsa'
Settings fixade

bra
Merge remote-tracking branch 'origin/Kajsa'
Merge remote-tracking branch 'origin/master' into elisabeth