Merge branch 'master' of https://github.com/YangDan/RookieEditor

Conflicts:
	README.md