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

Conflicts:
	Python.gitignore

Python.gitignore

@@ -56,6 +56,9 @@ local_settings.py
 # Flask instance folder
 instance/
 
+# Scrapy stuff:
+.scrapy
+
 # Sphinx documentation
 docs/_build/
 
@@ -70,3 +73,9 @@ target/
 
 # celery beat schedule file
 celerybeat-schedule
+
+# dotenv
+.env
+
+# Spyder project settings
+.spyderproject