verify the commint
Add one file
Merge pull request #1 from ruil2/master

verify the commint
fork test
Add mac folder
Revert "Add one file"

This reverts commit 6518580fd3919fa0c9e37de4c13f5bc8eccb478e.
Add for forc sync test
add printf
define a variable
Merge branch 'master' of https://github.com/gangyang1988/OceanGangCode
add one file
Merge branch 'master' of https://github.com/GangYangCisco/OceanGangCode

Conflicts:
	DesignPattern/DesignPatternMain/DesignPatternMain/DesignDocument.txt
Merge branch 'master' of https://github.com/ruil2/OceanGangCode into macTest

Conflicts:
	DesignPattern/DesignPatternMain/DesignPatternMain/DesignPatternMain.cpp