Revert "Revert "test""

This reverts commit 82dd110d4877fdce878676060befb6f6c1bc4159.
Merge branch 'master' of https://github.com/cahrsjo/iprog14_group20_lab2

Conflicts:
	.idea/workspace.xml