'Merge' branch 'desktop' into master
Merge branch 'master' into laptop
added color by default for git