Merge branch 'master' of https://github.com/faiden/dotfiles
i got no idea what im doing