Adding .editorconfig to enforce consistent spacing regardless of editor being used - Fixes #29
Change project structure to be less confusing - fixed #28
Merge branch 'upstream/master'