add 1.2.2, 1.2.4
Merge branch 'master' of https://github.com/generall/electro

Conflicts:
	Materials/part1.tex