Added clustering.
solved conflict.

Conflicts:
	index.html