add 3

add echo c
Merge remote-tracking branch 'origin/master'

Conflicts:
	my.php