changed a link in index.html
merged branches and modified readme