add echo
delete echo
Merge branch 'testing'

Conflicts:
	my.php

all ok
delete echo
add echo
Merge branch 'testing'

Conflicts:
	my.php