fixed README after merge
fixed weird stuff that happened during the merge