added .env file
fixed merge conflict gitignore
additions for testing auth flow
merged in changes on github