add an .editorconfig file
Merge branch 'master' of github.com:tnris/site-mockup
Merge branch 'master' of github.com:tnris/site-mockup

Conflicts:
	.editorconfig