fejlesztoi leirasokba a githubrol es az igemutatorol
Merge branch 'master' of https://github.com/borazslo/szentiras.hu
Merge remote-tracking branch 'origin/master' into mvc

Conflicts:
	old/info.php