puig, thevenaz
Merge branch 'master' of https://github.com/wollollo/Maths

Conflicts:
	writings/addcomb/quasirandom.tex