Merge branch 'master' of https://github.com/edouardoyallon/surf_ipol

Conflicts:
	draft_surf_juju.log
	draft_surf_juju.pdf
	draft_surf_juju.synctex.gz