krock
Merge branch 'master' of https://github.com/camso242/labb-1

Conflicts:
	labb1-2.html
Backade mina fulhack / David
Merge branch 'master' of https://github.com/camso242/labb-1
Merge branch 'master' of https://github.com/camso242/labb-1
Tog bort testkatalogen