add scan color histogram function into colorhist class
Merge branch 'master' of https://github.com/imouto1994/CS3246-Assignment-1

Conflicts:
	.idea/workspace.xml
	src/FindIO/ColorHistIndex.java
	src/FindIO/Common.java