update delete file
good
delete
update file
update file again
add a test.html
resolve conflict
update cup.txt
Merge branch 'master' into delete

Conflicts:
	cup.txt
edit cup.txt
Merge branch 'delete'
cup.txt
cup.txt in delete branch
cup.txt
this is good
Merge branch 'delete'

Conflicts:
	cup.txt
upload index.html
upload again
upload file
upload love file