add quill
Merge branch 'master' into refine-text-node
save
save
save
modify views.js
modify views.js
modify views.js
modfiy views.js
save
remove *.sw* file
Merge branch 'master' into refine-text-node

Conflicts:
	client/views.js
	public/js/editor.js
modify views.js & resizeImg.js
modify views.js
fix border size type
Merge branch 'master' of github.com:limijiaoyin/slides-editor

Conflicts:
	public/js/editor.js
save
Merge branch 'master' into refine-text-node

Conflicts:
	client/views.js
	public/js/editor.js
scrollbar
Merge remote branch 'origin/master'