rm Ternice.cdp
Merge branch 'master' of github.com:tjuliuyou/tolly
complie pass
logger.hpp
conflict fixed'
finishlog