:memo: Update readme
Merge branch 'develop'
Add editorconfig
Merge branch 'develop'
Merge remote-tracking branch 'rails-base/master' into rails-base-update

Conflicts:
	README.md
Merge branch 'rails-base-update'