Initial commit
Merge remote branch 'test2/master'

Conflicts:
	README.md
I have added a phpinfo into index.php in public