fixin and trixin
Merge branch 'master' of https://github.com/adrianforsius/dotfiles