Init commit
Merge branch 'master' of https://github.com/fat32nov/coursework

Conflicts:
	server/server.c