update ignore file
update new ignore
Merge branch 'master' of https://github.com/izerocrazy/unity

Conflicts:
	.gitignore