Prevent CSS conflicts
Merge pull request #102 from devalnor/master

Prevent CSS conflicts