updates gitignore
Merge branch 'master' of https://github.com/wangteji/Wangteji

Conflicts:
	.gitignore