trying to revert
Merge branch '48hours' of https://github.com/Bradshaw/octo-hipster into 48hours