changes
Merge branch 'master' of github.com:lindkjop/swaggruppe12

Conflicts:
	helo.txt
Merge branch 'master' of github.com:lindkjop/swaggruppe12