g
Merge branch 'master' of https://github.com/Anatoliuz/Labs_Orlov

Conflicts:
	Lab1.1/Lab1.1/main.c