manquait un user
Merge remote-tracking branch 'origin/master'

Conflicts:
	styliste/fixtures/initial_data.json