修改gitignore
Merge branch 'master' of github.com:andrinux1992/WSBPersonal_Repository

Conflicts:
	.gitignore