merge test2
1234
Merge branch 'master' of https://github.com/tianyawy/Hello-WordII

Conflicts:
	Readme.txt