add kita
Merge branch 'master' into kita

Conflicts:
	index.html
Merge branch 'kita'