Build #149:   Merge branch 'master' of bitbucket.org:trondaal/it2810-21-oppgave-3 on branch master almost 9 years ago