updated the readme file
useless files
merge conflict