commit on test
Revert "commit on test"

This reverts commit 7a9a006a6bd0e1d6a847c0d348d1f8b8b4476002.
no message
Merge branch 'master' of https://github.com/mavisz/testProject

Conflicts:
	phpinfo.php