初始化程序结构
Merge branch 'master' of https://github.com/jiangwy/webarch.git

Conflicts:
	trunk/github.txt