watch
diff before and now.
添加一个静态主页
Merge remote-tracking branch 'origin/develop'

Conflicts:
	index.php