Merge branch 'master' of github.com:github/gitignore into patch-1

Conflicts:
	Python.gitignore

diff --cc Python.gitignore
index 59678313f6c327caf126d853acb2080ecc0fe8d6,4f823c47ee442275d7d6e0d69793a3cd5ae7f1d3..908a064b7df3f10e43973541af666746407bddaf
--- 1/Python.gitignore
--- 2/Python.gitignore
+++ b/Python.gitignore
@@@ -68,5 -71,8 +71,11 @@@ target
  # pyenv
  .python-version
  
 +# celery beat schedule file
 +celerybeat-schedule
++
+ # dotenv
+ .env
+ 
+ # Spyder project settings
+ .spyderproject