Merge pull request #6 from huhhots/featureA

add feature B
hohhots
Merge remote-tracking branch 'upstream/master' into featureA

Conflicts:
	brgd.txt