add 1.8, 1.6 fix
Merge branch 'master' of https://github.com/generall/electro

Conflicts:
	Materials/part1.tex