Everything.
Everything.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Folder_Monitor.py