I have no idea what I am doing, am I even a git dumb anymore?
Merge branch 'onehundred' of github.com:OlaOst/glamour into onehundred