update gitignore
Merge branch 'master' of github.com:liangji101/jy

Conflicts:
	.gitignore