edited readme
merged