commiting MainActivity before pull
changes before merge
made get total cups only apply to one day