коммит Хрунова
Merge branch 'master' of github.com:severnarayan/PO41_2013

Conflicts:
	index.php