Ajout de choix d'implémentation
Merge branch 'master' of github.com:blegat/LINGI1113

Conflicts:
	reveil/Rapport/rapport.aux
	reveil/Rapport/rapport.fdb_latexmk
	reveil/Rapport/rapport.log
	reveil/Rapport/rapport.pdf
	reveil/Rapport/rapport.tex