resolved conflict
Updated README to markdown format