adding files to repo
fixing readme conflict