Add two more lines
Merge branch 'story'

Conflicts:
	quiz.txt.txt