Partially working part 5
Merge branch 'master' of https://github.com/MartinFaartoft/sigb

Conflicts:
	ass2/Assignment_Cube.py