Merge branch 'master' of https://github.com/hbyzw/idioms

Conflicts:
	res/res.txt
Merge branch 'master' of https://github.com/hbyzw/idioms
commit list