gitignore
Delete database.yml
database delete
Merge remote-tracking branch 'origin/feature' into feature

Conflicts:
	config/database.yml
database delete
Delete database.yml
capistrano install
Merge remote-tracking branch 'origin/feature' into feature
Merge remote-tracking branch 'origin/dev' into dev