edited README.md
added conf file
merge