Hozzáírva
Merge branch 'master' of github.com:tenkmilan/Teaching1

Conflicts:
	test.txt