matlab cluster analysis complete
Merge branch 'master' of github.com:peterklipfel/automashup

Conflicts:
	pingPong.py