Update index.php
Merge branch 'master' into test
Merge branch 'test' of https://github.com/flowip/php-test into test

Conflicts:
	index.php
test
test
test3