changing at the beginning
dark start
Merge branch 'feature'

Conflicts:
	story.txt