styling
Merge branch 'master' of https://github.com/mjseaman/stacked
more style
fucking flipping man
conflict resolved
merged