2.1.4 fix
2.1.4 fix
Merge branch 'master' of https://github.com/generall/electro

Conflicts:
	Materials/3/4.tex
Merge branch 'master' of https://github.com/generall/electro
qqq_10.tex