Adding database to gitignore
Removing the database from version control
Merge remote-tracking branch 'origin/master'