changement de routes.rb
Merge branch 'master' of https://github.com/checkers-labs/rails.git

Conflicts:
	config/routes.rb
routes.rb