Add .env to .gitignore
Merge branch 'master' into lists

Conflicts:
	.gitignore