contrib commit 1

Conflicts:

	README.md
[feature] some commit