remove database.yml, added database.yml.example, added pg
resolve conflicts