Dégénerescence.
Merge branch 'master' of github.com:arthaud/GRO

Conflicts:
	proglin/rapport_proglin.tex