pouet
merge

Conflicts:
	rank.rb