* Corrected bug in cocktail image
Merge branch 'develop' of github.com:SaltySoft/happy_hours into develop
* Removed phantom files