fix merge
fix merge
Merge branch 'master' of https://github.com/PqBenoit/scrum
Merge branch 'master' of https://github.com/PqBenoit/scrum
Merge branch 'master' of https://github.com/PqBenoit/scrum
start classement
Merge branch 'master' of https://github.com/PqBenoit/scrum

Conflicts:
	app/views/pages/index.html.erb
Merge branch 'master' of https://github.com/PqBenoit/scrum
avanced
classement sans queries
classement presque fini
Merge branch 'master' of https://github.com/PqBenoit/scrum
Classement
Merge branch 'master' of https://github.com/PqBenoit/scrum