Ignore .env in root
Merge branch 'master' of github.com:mozillafordevelopment/webmaker-app
Merge branch 'master' of github.com:mozillafordevelopment/webmaker-app