Add environment variables
Add .gitconfig
Merge branches 'working-env' and 'working-gitconfig' into working