changements
Merge branch 'master' of github.com:alexandre33/Merci

Conflicts:
	db/schema.rb