make some changes in file 1.WordMapping
Merge branch 'master' of https://github.com/emomgithub/projects
some changes
Merge branch 'master' of https://github.com/emomgithub/projects

Conflicts:
	PHPProject/1.WordMapping.php
Merge branch 'master' of https://github.com/emomgithub/projects

Conflicts:
	PHPProject/1.WordMapping.php
Merge branch 'master' of https://github.com/emomgithub/projects
add 1.txt