without error colors
Merge branch 'master' of github.com:Avitella/conf