added readme
added readme
resolved conflicts