changed tim to cheryl
added notes to file2
Merge branch 'tim' of github.com:yenachung/yena_story into tim

Conflicts:
	file.txt