commit my change
Merge remote-tracking branch 'origin/master'

Conflicts:
	example.txt
Merge branch 'master' of https://github.com/computerVisionHistogramOf3DFacets/HistogramOf3dFacets

Conflicts:
	example.txt
+ add base code
+ add vidual project
+ add gpu code
+ add based code
+ add based code again