test
Merge branch 'master' of https://github.com/lastyrain/editor

Conflicts:
	LASTY/index2.html
test