cleaned up app, added .env to gitignore
merged