something i don't konw
Merge branch 'master' of https://github.com/risentveber/Project

Conflicts:
	serv_clnt.c