Тестовый коммит
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/classes/Controller/Main/Main.php
	application/views/template/main/main.php
Тестовый коммит