Using underscore templates for drink menu
Merged conflicts in menu.js