some flaws
Merge branch 'master' of https://github.com/cfgchouhang/MarkNote

Conflicts:
	templates/index.html
fix conflicts
edit and update feature