Da siem przechowywywywac FiLE na serwerze
Merge branch 'master' of https://github.com/marc-inn/tin

Conflicts:
	server/server_io.c