test git add
Merge branch 'master' of https://github.com/lianglanl/testphpunit into feature/myfirst

Conflicts:
	test.php