* Design on cocktail list
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
* Correction on apocalypse