form done, working on javascript for drinks
fixed merge conflicts in new drink