homo
Merge branch 'master' of https://github.com/hakoking/website

Conflicts:
	index.html
Merge branch 'master' of https://github.com/hakoking/website
hoi
Merge branch 'master' of https://github.com/hakoking/website