added readme
fixed merging issues