ÅÅÅÅÅ
Merge branch 'master' of github.com:ELFswe/test

Conflicts:
	Din pappa.txt