checkin
Merge branch 'master' of github.com:nickthesing/cluster

Conflicts:
	cluster.js