test conflict 2
Merge branch 'master' of https://github.com/king89/CustomWeibo.git

Conflicts:
	test.txt