add gitignore
resolve README conflict