zaczynam pisac serwer
Merge branch 'master' of https://github.com/sasza8/IOLista

Conflicts:
	code/makefile
	code/serwer.cpp
a