upload button and primary colour detection
Merge remote-tracking branch 'origin/master'

Conflicts:
	col_det.py