- resolve conflicts
Merge branch 'master' of github.com:fongchun/CLC-projects