<<<<<<< HEAD workspace, edit fra master ======= workspace, en edit >>>>>>> 8d4adee638c14d62f999597f574ddb3f3ebbfabf ========= shared workspace for homework in 290b