resolve conflicts in css rules
Merge pull request #6 from sealocal/update_styles

resolve conflicts in css rules