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

Conflicts:
	res/list.txt