a weeks worth
Merge branch 'master' of https://github.com/csc8630Spring2014/Clusterizer