Merge branch 'master' of https://github.com/cahrsjo/iprog14_group20_lab2

Conflicts:
.idea/workspace.xml