Edits local.txt
Merge branch 'master' of https://github.com/ThuF/Dancho1234.git into changes_branch_i