test 2
Merge branch 'master' into test1branch

Conflicts:
	newcode1.php.txt