first commit
ciao
Merge branch 'master' of https://github.com/Fruttolo/progettosaed

Conflicts:
	query.py
	server.py