'master' of https://github.com/MMazzocchi/kiwi

Conflicts:
index.html
kiwistyle.css
commiting
Merge branch 'master' of https://github.com/MMazzocchi/kiwi

Conflicts:
	index.html
	kiwilib.js
c