rollback commit 2
text modify commit
Merge branch 'master' of https://github.com/timids/dev

Conflicts:
	README.md