README
Merge branch 'master' of git.oschina.net:ldshuang/mnotes into dev
fix
Merge branch 'dev'