add cgrep to grep with --color=always flag
Merge branch 'master' into HEAD
remove grep options