Fix calorie count and sober time UI field
Merge branch 'master' of https://github.com/Rosie-Brigham/good-night
It's sober o clock

Jquery sober calculation working
Addition of more drinks

- More drinks added to UI
- welcome/index.html moved to drinks/index.html
Merge branch 'master' of https://github.com/Rosie-Brigham/good-night