FIX: man messy code
Merge branch 'master' of github.com:ButBueatiful/dotfiles