Add a .editorconfig file
Add timestamp and extra information to local changes during conflict resolution
Merge branch 'master' of github.com:forbesmyester/SyncIt