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

Conflicts:
	Assignment1/main.o
merge fix