michelle's readme edit
merge resolution