Merge pull request #18 from charlesboes/Harris_IP

Merge pull request #17 from charlesboes/master
Add Vlfeat
Merge branch 'master' of https://github.com/charlesboes/Banana_Project

Conflicts:
	vlfeat-0.9.19/bin/glnx86/aib
	vlfeat-0.9.19/bin/glnx86/libvl.so
	vlfeat-0.9.19/bin/glnx86/mser
	vlfeat-0.9.19/bin/glnx86/sift
	vlfeat-0.9.19/bin/glnx86/test_gauss_elimination
	vlfeat-0.9.19/bin/glnx86/test_getopt_long
	vlfeat-0.9.19/bin/glnx86/test_gmm
	vlfeat-0.9.19/bin/glnx86/test_heap-def
	vlfeat-0.9.19/bin/glnx86/test_host
	vlfeat-0.9.19/bin/glnx86/test_imopv
	vlfeat-0.9.19/bin/glnx86/test_kmeans
	vlfeat-0.9.19/bin/glnx86/test_liop
	vlfeat-0.9.19/bin/glnx86/test_mathop
	vlfeat-0.9.19/bin/glnx86/test_mathop_abs
	vlfeat-0.9.19/bin/glnx86/test_nan
	vlfeat-0.9.19/bin/glnx86/test_qsort-def
	vlfeat-0.9.19/bin/glnx86/test_rand
	vlfeat-0.9.19/bin/glnx86/test_sqrti
	vlfeat-0.9.19/bin/glnx86/test_stringop
	vlfeat-0.9.19/bin/glnx86/test_svd2
	vlfeat-0.9.19/bin/glnx86/test_threads
	vlfeat-0.9.19/bin/glnx86/test_vec_comp
	vlfeat-0.9.19/bin/glnxa64/aib
	vlfeat-0.9.19/bin/glnxa64/libvl.so
	vlfeat-0.9.19/bin/glnxa64/mser
	vlfeat-0.9.19/bin/glnxa64/sift
	vlfeat-0.9.19/bin/glnxa64/test_gauss_elimination
	vlfeat-0.9.19/bin/glnxa64/test_getopt_long
	vlfeat-0.9.19/bin/glnxa64/test_gmm
	vlfeat-0.9.19/bin/glnxa64/test_heap-def
	vlfeat-0.9.19/bin/glnxa64/test_host
	vlfeat-0.9.19/bin/glnxa64/test_imopv
	vlfeat-0.9.19/bin/glnxa64/test_kmeans
	vlfeat-0.9.19/bin/glnxa64/test_liop
	vlfeat-0.9.19/bin/glnxa64/test_mathop
	vlfeat-0.9.19/bin/glnxa64/test_mathop_abs
	vlfeat-0.9.19/bin/glnxa64/test_nan
	vlfeat-0.9.19/bin/glnxa64/test_qsort-def
	vlfeat-0.9.19/bin/glnxa64/test_rand
	vlfeat-0.9.19/bin/glnxa64/test_sqrti
	vlfeat-0.9.19/bin/glnxa64/test_stringop
	vlfeat-0.9.19/bin/glnxa64/test_svd2
	vlfeat-0.9.19/bin/glnxa64/test_threads
	vlfeat-0.9.19/bin/glnxa64/test_vec_comp
	vlfeat-0.9.19/bin/maci/aib
	vlfeat-0.9.19/bin/maci/libvl.dylib
	vlfeat-0.9.19/bin/maci/mser
	vlfeat-0.9.19/bin/maci/sift
	vlfeat-0.9.19/bin/maci/test_gauss_elimination
	vlfeat-0.9.19/bin/maci/test_getopt_long
	vlfeat-0.9.19/bin/maci/test_gmm
	vlfeat-0.9.19/bin/maci/test_heap-def
	vlfeat-0.9.19/bin/maci/test_host
	vlfeat-0.9.19/bin/maci/test_imopv
	vlfeat-0.9.19/bin/maci/test_kmeans
	vlfeat-0.9.19/bin/maci/test_liop
	vlfeat-0.9.19/bin/maci/test_mathop
	vlfeat-0.9.19/bin/maci/test_mathop_abs
	vlfeat-0.9.19/bin/maci/test_nan
	vlfeat-0.9.19/bin/maci/test_qsort-def
	vlfeat-0.9.19/bin/maci/test_rand
	vlfeat-0.9.19/bin/maci/test_sqrti
	vlfeat-0.9.19/bin/maci/test_stringop
	vlfeat-0.9.19/bin/maci/test_svd2
	vlfeat-0.9.19/bin/maci/test_threads
	vlfeat-0.9.19/bin/maci/test_vec_comp
	vlfeat-0.9.19/bin/maci64/aib
	vlfeat-0.9.19/bin/maci64/libvl.dylib
	vlfeat-0.9.19/bin/maci64/mser
	vlfeat-0.9.19/bin/maci64/sift
	vlfeat-0.9.19/bin/maci64/test_gauss_elimination
	vlfeat-0.9.19/bin/maci64/test_getopt_long
	vlfeat-0.9.19/bin/maci64/test_gmm
	vlfeat-0.9.19/bin/maci64/test_heap-def
	vlfeat-0.9.19/bin/maci64/test_host
	vlfeat-0.9.19/bin/maci64/test_imopv
	vlfeat-0.9.19/bin/maci64/test_kmeans
	vlfeat-0.9.19/bin/maci64/test_liop
	vlfeat-0.9.19/bin/maci64/test_mathop
	vlfeat-0.9.19/bin/maci64/test_mathop_abs
	vlfeat-0.9.19/bin/maci64/test_nan
	vlfeat-0.9.19/bin/maci64/test_qsort-def
	vlfeat-0.9.19/bin/maci64/test_rand
	vlfeat-0.9.19/bin/maci64/test_sqrti
	vlfeat-0.9.19/bin/maci64/test_stringop
	vlfeat-0.9.19/bin/maci64/test_svd2
	vlfeat-0.9.19/bin/maci64/test_threads
	vlfeat-0.9.19/bin/maci64/test_vec_comp
	vlfeat-0.9.19/toolbox/mex/mexa64/libvl.so
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_aib.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_aibhist.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_alldist.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_alldist2.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_binsearch.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_binsum.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_covdet.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_cummax.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_dsift.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_erfill.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_fisher.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_getpid.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_gmm.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_hikmeans.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_hikmeanspush.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_hog.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_homkermap.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_ihashfind.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_ihashsum.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_ikmeans.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_ikmeanspush.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_imdisttf.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_imintegral.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_imsmooth.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_imwbackwardmx.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_inthist.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_irodr.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_kdtreebuild.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_kdtreequery.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_kmeans.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_lbp.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_liop.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_localmax.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_mser.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_quickshift.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_rodr.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_sampleinthist.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_sift.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_siftdescriptor.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_simdctrl.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_slic.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_svmtrain.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_threads.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_tpsumx.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_twister.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_ubcmatch.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_version.mexa64
	vlfeat-0.9.19/toolbox/mex/mexa64/vl_vlad.mexa64
	vlfeat-0.9.19/toolbox/mex/mexglx/libvl.so
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_aib.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_aibhist.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_alldist.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_alldist2.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_binsearch.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_binsum.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_covdet.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_cummax.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_dsift.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_erfill.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_fisher.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_getpid.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_gmm.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_hikmeans.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_hikmeanspush.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_hog.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_homkermap.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_ihashfind.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_ihashsum.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_ikmeans.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_ikmeanspush.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_imdisttf.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_imintegral.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_imsmooth.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_imwbackwardmx.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_inthist.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_irodr.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_kdtreebuild.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_kdtreequery.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_kmeans.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_lbp.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_liop.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_localmax.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_mser.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_quickshift.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_rodr.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_sampleinthist.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_sift.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_siftdescriptor.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_simdctrl.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_slic.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_svmtrain.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_threads.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_tpsumx.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_twister.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_ubcmatch.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_version.mexglx
	vlfeat-0.9.19/toolbox/mex/mexglx/vl_vlad.mexglx
	vlfeat-0.9.19/toolbox/mex/mexmaci/libvl.dylib
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_aib.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_aibhist.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_alldist.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_alldist2.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_binsearch.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_binsum.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_covdet.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_cummax.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_dsift.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_erfill.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_fisher.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_getpid.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_gmm.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_hikmeans.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_hikmeanspush.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_hog.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_homkermap.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_ihashfind.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_ihashsum.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_ikmeans.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_ikmeanspush.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_imdisttf.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_imintegral.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_imsmooth.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_imwbackwardmx.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_inthist.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_irodr.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_kdtreebuild.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_kdtreequery.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_kmeans.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_lbp.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_liop.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_localmax.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_mser.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_quickshift.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_rodr.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_sampleinthist.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_sift.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_siftdescriptor.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_simdctrl.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_slic.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_svmtrain.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_threads.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_tpsumx.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_twister.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_ubcmatch.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_version.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci/vl_vlad.mexmaci
	vlfeat-0.9.19/toolbox/mex/mexmaci64/libvl.dylib
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_aib.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_aibhist.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_alldist.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_alldist2.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_binsearch.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_binsum.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_covdet.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_cummax.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_dsift.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_erfill.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_fisher.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_getpid.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_gmm.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_hikmeans.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_hikmeanspush.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_hog.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_homkermap.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_ihashfind.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_ihashsum.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_ikmeans.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_ikmeanspush.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_imdisttf.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_imintegral.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_imsmooth.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_imwbackwardmx.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_inthist.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_irodr.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_kdtreebuild.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_kdtreequery.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_kmeans.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_lbp.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_liop.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_localmax.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_mser.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_quickshift.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_rodr.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_sampleinthist.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_sift.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_siftdescriptor.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_simdctrl.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_slic.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_svmtrain.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_threads.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_tpsumx.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_twister.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_ubcmatch.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_version.mexmaci64
	vlfeat-0.9.19/toolbox/mex/mexmaci64/vl_vlad.mexmaci64
Merge branch 'Harris_IP'
test
Merge branch 'Harris_IP'
Merge branch 'master' of https://github.com/charlesboes/Banana_Project
Compute vocabulary and histograms
Merge branch 'Vocabulary'
Delete m
Merge pull request #19 from charlesboes/master

MAJ
Merge pull request #20 from charlesboes/vocaabulary

Merge pull request #19 from charlesboes/master
Merge branch 'master' of https://github.com/charlesboes/Banana_Project

Conflicts:
	D_Creating_Vocabulary.m
Merge branch 'master' of https://github.com/charlesboes/Banana_Project
Merge branch 'master' into Harris_IP