first step commit
second step commit
Merge branch 'master' of github.com:bykovdenis/firststep

Conflicts:
	index.php