updated the readme
chanched the readme file to markdown
solved merge conflict