Merge branch 'master' of https://github.com/maria-elfimova/study

Conflicts:
	sem II/Hw6/Hw6.v11.suo
Merge branch 'master' of https://github.com/maria-elfimova/study