function download and upload completed
Merge branch 'master' of https://github.com/corso-python-prato/share-system-team1

Conflicts:
	server/server.py