mer design, ikke ferdig

lagt til checkboxes etc.. pirka mye i assets og i andre
conflict resolved

discarded coflicting changes
discarder connflicts

ok
Merge branch 'holskil-master'
merge conflicts resolved

OK
Shortcuts and labels
78DADFA SAVES THE DAY