Fixing history.
Merge branch 'master' of github.com:sebsebseb123/custom_config