edit readme
Merge branch 'readme'