Too many things to be written...
Merge branch 'master' of https://github.com/xowor/UniSO

Conflicts:
	src/client.c
	src/config.h