fix colors
fix prompt
Merge branch 'master' of github.com:Avitella/cnf