Update .gitignore
Merge branch 'master' into use-dotenv

Conflicts:
	.gitignore