Merge branch 'master' of github.com:Krisztian-Huterjak/gitszeged

Conflicts:
	second.txt
Merge branch 'master' of github.com:Krisztian-Huterjak/gitszeged