Lite justeringar
Merge branch 'master' of https://github.com/charlsa/CDIO-GotaKanal

Conflicts:
	Main program/main.c