stupid changes
Merge branch 'master' of https://github.com/dohnto/CDP.git
color change
Merge branch 'master' of https://github.com/dohnto/CDP.git