server
Merge branch 'master' of https://github.com/palkakrzysiek/IT-class

Conflicts:
	labs/os/lab5/server.c