Edited .editorconfig file so my partner and I will have tab for our indent style
Updating local branch
Updating local branch
Fixed merge conflicts