working copy in digenv
Merge branch 'master' of https://github.com/jonac/operativsystem

Conflicts:
	labb1/digenv.c