Bestilling WIP
Merge branch 'master' of https://github.com/OptimusCrime/it2805-frisor
Bestilling merge