try to merge local ubuntu
merge local unbuntu success
try to merge local unbuntu day2
Merge branch 'master' of https://github.com/Yuchengw/CupCake
try to clean