Changed the README
merged branches