Testing!!!!!!!!!
Merge branch 'master' of https://github.com/olavemil/TDT4255ex1