first commit
test.html
third
Some changes
A change
test1 change
hjh2 change
hjh change
Merge branch 'master' of ../githost

Conflicts:
	test.html
test2.html add
hjh2 make function
hjh function a change
hjh2 function b change
Merge ../githost
new testing branch
master branch
testing2 branch
merged master
aaaaa
fdsafasdfsafd