class coucou
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ranking-OCR/src/ranking/SimpleRanker.java