changed db_name to match the database we'll be using
Merge remote-tracking branch 'origin/master'