qqqq
this is the first commit
this is first commit on README to home
hao
ok
this is the first commit of home4 to home
this is second commit of README in home1 to home
Merge branch 'master' of https://github.com/xu1718191411/home

Conflicts:
	README
11111111
added a new footer [iss53]
fixed the broken email address
finshed the new footer [iss53]
Merge branch 'iss53'

Conflicts:
	index.html
asd
asdas
adasd
Merge branch 'hotfix2'
asdfasd
adsa
Merge branch 'hotfix2'