удаление
Merge branch 'alex' of github.com:yakushevav/mt
Merge branch 'alex' of github.com:yakushevav/mt

Conflicts:
	news_page.php
Merge branch 'alex' of github.com:yakushevav/mt
Merge branch 'alex' of github.com:yakushevav/mt
удаление
Merge branch 'alex'

Conflicts:
	news_page.php
удаление
добавление