I QUIVER
Merge branch 'master' of https://github.com/MartinFaartoft/sigb into clustering

Conflicts:
	ass1/Assignment1.py