添加注释，重构了文件。
Merge remote-tracking branch 'origin/master'

Conflicts:
	cell.js