initial commit
fixed readme conflict
removed unnecessary files