Updated .gitignore
Merge branch 'master' of https://unogz@github.com/unogz/izhihu.git

Conflicts:
	.gitignore