poprawki serwera
Merge branch 'master' of github.com:prajmus/TIN

Conflicts:
	Client2/client.cpp
	Client2/client.h
	Client2/fileserver.cpp