Added editorconfig file
Merge branch 'master' into reindent