添加忽略.json和.conf配置文件

Signed-off-by: cfanbo <haohtml@gmail.com>
Merge branch 'master' of github.com:cfanbo/gotest

Conflicts:
	.gitignore