BugFixes
Merge -.-

Conflicts:
	client.py
	server.py