hello.txt módosítva
Merge branch 'master' of github.com:tenkmilan/Teaching2

Conflicts:
	hello.txt