solving edit conflict
more readme edit
Merge branch 'readme'