update yyy 1
merged yyy
Merge branch 'master' of https://github.com/vuzem/res
commit merge
Conflicts:
	yyy.txt