修改xxxx
修改xxxx
修改111
jjjjjjjjjjjjj
dddddddddd
Merge branch 'xiong' of https://github.com/jiabinxiong/exercirse into xiong

Conflicts:
	home.html
jjjjjjjjjjjjj
dddddddddd
dddddd
yanyan
第一行修改
修改master
修改冲突
添加一行
Merge branch 'jia'
修改xxx
重新修改
xxxxxxxxxxxxxxx
去掉内容
xion.html whtenty