horton: changed gaac
Merge branch 'master' of https://github.com/Huarong/people_clustering
horton:2014-5-1
horton: ignore image
Merge branch 'master' of https://github.com/Huarong/people_clustering

Conflicts:
	people_clustering/FeatureExtractor.py
	people_clustering/gen_result.py
horton: delete files