changes
changes
Merge branch 'master' of https://github.com/GuidesRostov/GuidesSite

Conflicts:
	index.php