Merge branch 'new/cookiestore' of github.com:hpxro7/UWSchedule into new/cookiestore