edit the ignoe file
Merge branch 'master' of https://github.com/sunxiaoyu/UnityTest

Conflicts:
	.gitignore