messing with centroids
Merge branch 'master' of https://github.com/kaycole/fish_shift

Conflicts:
	Code/centroids.R

Fixed merge issues in centroid.R