All my shiet
Merge branch 'master' of github.com:RobertBorg/SE-LTH-EDA031-VT13

Conflicts:
	Labs/lab2/src/vertex.h