这个是第二个人进行提交的内容
Merge branch 'master' of https://github.com/JamesLiAndroid/testHelloWorld

Conflicts:
	Add.txt