try to merge day3.txt from local mac
Merge branch 'master' of https://github.com/Yuchengw/CupCake
Merge branch 'master' of https://github.com/Yuchengw/CupCake
try a little
Merge branch 'master' of https://github.com/Yuchengw/CupCake
upload to local mac to resovle