Update README.md
Fixed conflicts
Merge branch 'master' into superquadrics