haaaaaaaaaaaaaalllllllllllllllllllllllllloooooooooooooooo
Merge branch 'master' of https://github.com/tms-hl/test

Conflicts:
	namen.txt
Merge branch 'master' of https://github.com/tms-hl/test

Conflicts:
	namen.txt