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

This reverts commit 854a2cd81bdf76df8fa140c9d1b6dee865fbd90c, reversing
changes made to f252473f83dd07bceebec8e4d4433d6f152c9405.
Revert "Merge branch 'master' of https://github.com/cahrsjo/iprog14_group20_lab2"

Conflicts:
	.idea/workspace.xml