fixed some bugs
Merge branch 'master' of https://github.com/Hitomi614/309-candystore
fixed some bugs