Sådant
Merge branch 'master' of https://github.com/gorcsa/Hello-World

Conflicts:
	jaja.txt