28.11.2013 23:26
Merge branch 'master' of https://github.com/MikalaiSivokha/BSUIR

Conflicts:
	SPOLKS/SPOLKS_Lab3-5/Client/Client/main.cpp
	SPOLKS/SPOLKS_Lab3-7/Server/Server/main.cpp