change in folderWatcher
Merge branch 'master' of https://github.com/CICS525-project/NSync-client