css merge issue
Merge pull request #220 from aptara/Gauri

css merge issue
Merge pull request #221 from aptara/Sprint-5

Sprint 5