Use algorithm
Merge branch 'master' of github.com:blegat/LINGI1113

Conflicts:
	reveil/Rapport/rapport.tex