Sans changement...
Alter
Merge branch 'alter'

Conflicts:
	story.txt