Started clustering framework
Merge remote-tracking branch 'origin/master'

Conflicts:
	cluster_algorithm.py