Initial commit.
Change README.doc

Change README.doc
Fixed conflict