?
erge branch 'master' of https://github.com/jvbrink/INF5620

Conflicts:
	oblig2/test_separabelSolution.py
woo, go spelling