stuff
Merge branch 'master' of https://github.com/TrimDich/trimm-dich