update column system
Merge branch 'master' of https://github.com/nozomi199/qimen_star

Conflicts:
	_js/jiqi.js
	qimen_star.html