initial commit
update readme
merged master  fixed conflict