重构.  使sublime 可以识别
Merge branch 'master' of github.com:wangkechun/stock_project

Conflicts:
	web/static/js/main.coffee
	web/static/js/main.js
分离 coffee js
index.html
移动 coffee 位置