local edit
merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestingGit/test1.php