logicの編集第2弾
Merge branch 'master' of github.com:sakiyama/Signal

Conflicts:
	app/webroot/js/main.js
	app/webroot/js/trade.js