readme edited
merging development