konflikt
Merge branch 'master' of github.com:johanedument/testar-krav

Conflicts:
	krav.txt