fixed order of labels
Merge branch 'master' of github.com:em-mo/TDDB44

Conflicts:
	src/lab6/quads.cc