initial commit
updated to readme
fixed README merge conflict