made a change
made other  change
edit my3.php
Merge branch 'testing'

Conflicts:
	my.php
	my3.php