Add to d.php
echo
echo1
Merge branch 'master' of https://github.com/jglin/test.git

Conflicts:
	d.php