initial commit
updated readme
removed conflict