test commit
Merge branch 'master' of https://github.com/oyvindrobertsen/TDT4100-Project.git
Merge branch 'master' of https://github.com/oyvindrobertsen/TDT4100-Project.git
test igjen