Тезисы
Merge branch 'master' of github.com:Vareniedimka/KIS
Merge branch 'master' of github.com:Vareniedimka/KIS

Conflicts:
	Общее/Атрибуты.xls