Changed readme
CHanged readme
Fixed merge conflict