Merge branch 'hotfix/shit-is-broke'
My more coolness
more awseomness
Merge branch 'feature/awesome_feature' into develop
my hotfix
merging my hotfix