some changes
Merge branch 'master' of github.com:NatashaLebed/test_composer

Conflicts:
	composer.json~
	index.php