Update .gitignore
Merge branch 'master' of https://github.com/flnixlee/work_study

Conflicts:
	.gitignore