working on auto-sync
minor updates to LocalFileMonitor and Client
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Client.py
	LocalFileMonitor.py
dfjdjl
minor changes to LocalFileMonitor