took out two conflicts in the css file
Merge branch 'master' of https://github.com/kexline4710/PatientEngagement into css_deployment_fix_2
Merge pull request #14 from kexline4710/css_deployment_fix_2

Css deployment fix 2