Merge branch 'master' of https://github.com/Gigioso/Clo

Conflicts:
	index.html
Revert "Merge branch 'master' of https://github.com/Gigioso/Clo"

This reverts commit 3d895caaa00d2fcbb04370f171fe90adecff6a5e.
nada
Merge branch 'master' of https://github.com/Gigioso/Clo