first commit
Merge https://github.com/dysangelist/shabby