git0
Merge branch 'master' of github.com:xiasiyu/20140813

Conflicts:
	hello.txt