asd
asd
asd
Merge branch 'master' of https://github.com/TeamHellman/Lab1.git

Conflicts:
	src/5dv118-lab1.c
Merge branch 'master' of https://github.com/TeamHellman/Lab1.git