added colors
Merge branch 'master' of https://github.com/mjhamm75/angular-clinical