added last name Li to Diana
resolved conflicts and added last name Li to Diana

Merge branch 'master' of https://github.com/dianateuthis/swc_test_repo

Conflicts:
	names.txt