debugging sync functionality
DOES NOT WORK IF CLIENT/SERVER ARE THE SAME MACHINE
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.py
increased wait time between syncs