new version without unnecessary files
README conflict resolved
README conflict resolved