beirtam egy bekezdest
Merge branch 'master' of https://github.com/koati/gitdemo into koati-master

Conflicts:
	index.html
Merge branch 'master' of https://github.com/urbalazs/gitdemo