added .env to .gitignore
Merge branch 'master' of github.com:JenHomann/decision-maker-app

Conflicts:
	.gitignore