fixed merge conflicts
fixed .env
Merge branch 'master' of github.com:jhenley45/grifter