update
Merge branch 'master' of https://github.com/HanYu1983/CardGame

Conflicts:
	goapp/static/editor.html