updated README
deleted some files
merge conflict solved