Readded config folder due to why did I even remove it
Merge branch 'master', remote branch 'origin'