added index
added readme
merge conflict