fork test
Merge branch 'master' of https://github.com/GangYangCisco/OceanGangCode

Conflicts:
	DesignPattern/DesignPatternMain/DesignPatternMain/DesignDocument.txt
Merge pull request #1 from ruil2/master

add some lines