update
Merge branch 'master' of https://github.com/s22l1g11/PyChat

Conflicts:
	src/server.py