Merge branch 'student03' of https://github.com/php-academy/news-project-yii into student03

Conflicts:
	index.php