combination
Merge branch 'master' of https://github.com/ruizhenh/FAT

Conflicts:
	FuncLib/InterHierarchy.cpp