Mod
M
Merge branch 'master' of github.com:GorshkovNikita/study
В
Merge branch 'master' of github.com:GorshkovNikita/study

Conflicts:
	modelling/Lab04/Lab04.v11.suo
Merge branch 'master' of github.com:GorshkovNikita/study

Conflicts:
	modelling/Lab05/Lab05.v11.suo
	modelling/Lab05/Lab05/bin/Debug/Lab05.exe
	modelling/Lab05/Lab05/bin/Debug/Lab05.pdb
	modelling/Lab05/Lab05/obj/Debug/Lab05.exe
	modelling/Lab05/Lab05/obj/Debug/Lab05.pdb
Т
Merge branch 'master' of github.com:GorshkovNikita/study

Conflicts:
	information_protection/Lab04/Lab04.v11.suo
	information_protection/Lab04/Lab04/obj/Debug/Lab04.csproj.FileListAbsolute.txt
	modelling/Lab03/Lab03.v11.suo
	modelling/Lab04/Lab04.v11.suo
Merge branch 'master' of github.com:GorshkovNikita/study

Conflicts:
	information_protection/Lab04/Lab04.v11.suo
	modelling/Lab04/Lab04.v11.suo
	modelling/Lab05/Lab05.v11.suo