updated before deploying to heroku
merging

Merge branch 'master' of github.com:abigezunt/EnviroView