merge fix
Merge branch 'master' of https://github.com/Rumleskaft/Indlejrede-Systemer-Gruppearbejde

Conflicts:
	Assignment1/main.c