asdf
Merge remote-tracking branch 'origin/Alextest'

Conflicts:
	Konflikt.txt