Refactored method of finding which files were changed; now hopefully robust and changeable to note conflicts and settle them
Merge branch 'master' of https://github.com/peigen831/ChatSockets into shar
Notes conflicts and creates conflicted copies for files who are updated at the same time according to the lastModified
;; Working on: conflicting copies based also on similarity between files