changed readme
merge of two branches
asdasdas