Added editorconfig, rebasing README, etc.
Fixed "README.md" conflict.