Merge branch 'master' of https://github.com/peder541/Okeebo

Conflicts:
	Test.txt
Merge branch 'master' of https://github.com/peder541/Okeebo

Conflicts:
	Test.txt