qq
QQ
qq
Merge branch 'master' of https://github.com/vanryuji/ahope

Conflicts:
	a.txt