修改.gitignore，自动忽略config/main.php。
Merge branch 'master' of https://github.com/liuwanwei/soyuapi

Conflicts:
	protected/config/main.php.bk