Return value editing.
Merge branch 'master' of https://github.com/blin4444/pcrs

Conflicts:
	server_side/server.py