Merge branch 'color' into colorhoggles

Conflicts:
	pd.mat
color hoggles