cc
cc
Merge branch 'master' of https://github.com/zjh459/consume_py

Conflicts:
	consume/dist/img/capcha.jpg