article.php cr��
Merge branch 'master' of https://github.com/Masterkdz/php_project

Conflicts:
	article.php