bac calculation
merge
fixed merge conflicts in new drink