local settings
added
added hidden
xinit
asdf
Merge branch 'master' of https://github.com/jokulhlaup/settings