test5
Merge branch 'master' of https://github.com/tdn/SMIF-Mozaiek

Conflicts:
	test.txt