remove testfile
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	test.php