Random commit
Merge branch 'master' of github.com:olavemil/TDT4255ex1