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

Conflicts:
	Main.pdf
	Materials/1/2.tex
	Materials/part1.tex
Merge branch 'master' of https://github.com/generall/electro

Conflicts:
	Main.pdf
	Materials/part1.tex