edit on the mmFork's master
after rebase, add . & commit, before merge
Merge branch 'master' into HEAD

Conflicts:
	README.md