change 2 to ddd
Merge branch 'master' of https://github.com/Shaojung/gittest

Conflicts:
	2.txt