asdf
asfd
Merge branch 'master' of http://github.com/jiangshu/test

Conflicts:
	a.txt
hg