next commit.... for ranking...
merging done...

Conflicts:
	advance.txt