added a todo and edit Readme
edit one.txt
Merge branch 'demo'
merge banrch la

Conflicts:
	one.txt