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

Conflicts:
	Materials/part1.tex
1.7 fix