playin'
Merge branch 'newRefine' of https://github.com/minillinim/GroopM into newRefine

Conflicts:
	groopm/cluster.py