Commit with right settings
Merge https://github.com/ChickenDaddy/DBMSproject