initial commit
added a paragraph to index
fixed merge