changed
Merge branch 'khoa' of https://github.com/daikissdd/gh-test

Conflicts:
	index.html