Change is made.
Merge branch 'modify-eric-txt-1'

Conflicts:
	eric.txts