test
pas bien
Merge branch 'master' of github.com:facenord-sud/collaide

Conflicts:
	db/schema.rb