Updated database.yml.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
Updated database.yml.