added database
made twitter login
fixed merged conflicts
fixed .env file
added gitignore
removed .env
added small change
Merge pull request #5 from gopher-snakes-2013/env_file_removed

Env file removed