Merge branch 'qwer'

Conflicts:
	zxcvtxt.txt
Merge branch 'master' of https://github.com/mshwang/Test

Conflicts:
	zxcvtxt.txt