initial commit
fixing README merge conflict
fixing README