ppfff
pff
Merge branch 'master' of https://github.com/generall/electro

Conflicts:
	Main.pdf
formula fix