removed the merge conflict
Merge branch 'master' of https://github.com/jwrobes/healthcare-x
fix the css merge and button styling