add
mergeMerge branch 'master' of github.com:xiuzhaoyang/hack

Conflicts:
	hack/hack/myModel/IHAction.h