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

Conflicts:
	Article.pdf