test
add
Merge branch 'master' of https://github.com/sukhdevpatidar/test1

Conflicts:
	phpini.php