test file from fedbox
Merge branch 'master' of https://github.com/telson/dotfiles