added to readme
merged conflicts