Merge branch 'master' of github.com:chadaort/PersonalWiki
adding LocalSettings to ignore list