added readme
fixing conflicts