Blabla rapport
Merge branch 'master' of https://github.com/arthaud/GRO

Conflicts:
	procstochs/rapport_procstochs.pdf