ostatnie poprawki w serwerze
Merge branch 'master' of https://github.com/sasza8/IOLista

Conflicts:
	code/client/client.cpp