Finished Settings
Fixed bugs in settings
Created and finished Choose A Drink/customize drink timer view
Made UI changes
Fixed conflicts and pushing changes