dat commit
t# Please enter the commit message for your changes. Lines starting
Merge branch 'dat_edit_css' of https://github.com/daikissdd/gh-test

Conflicts:
	index.html
update css
dat commit edit h1
Merge branch 'master' of https://github.com/daikissdd/gh-test

Conflicts:
	index.html
fix conflict