加一个后缀忽略项
Merge branch 'master' of github.com:FireLeaf/XGame
Merge branch 'master' of github.com:FireLeaf/XGame
Merge branch 'master' of github.com:FireLeaf/XGame
Merge branch 'master' of github.com:FireLeaf/XGame

Conflicts:
	.gitignore
Merge branch 'master' of github.com:FireLeaf/XGame
Merge branch 'master' of github.com:FireLeaf/XGame
Merge branch 'master' of github.com:FireLeaf/XGame
terrain modify