Commit
Merge branch 'master' of https://github.com/andybaoxv/COPDGene

Conflicts:
	doc/doc_notes_for_clustering2.0.tex