color detection
fix conflict(
Merge branch 'master' of github.com:papaloizouc/sockets