add huhhots
Merge remote-tracking branch 'upstream/master' into featureA

Conflicts:
	brgd.txt
Merge pull request #7 from huhhots/featureA

add huhhots