som man ska
Merge branch 'master' of https://github.com/olofmur/OP-labbar

Conflicts:
	Lab 1/digenv