Stuff.
Merge branch 'master' of github.com:Alexis211/SwitchBoxes

Conflicts:
	svg/4wires_box.pdf_tex
haha
Merge branch 'master' of github.com:Alexis211/SwitchBoxes

Conflicts:
	Article.tex
	Makefile