.
Merge branch 'master' of github.com:h8liu/c8

Conflicts:
	index.html
.