Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/tdt4140-group-58/spring2021-sellpoint into 20-legge-til-og-endre-kategorier-admin

co-author: @amalieur