fixed css
Merge pull request #66 from abcm1989/master

fixed css
fixing merge conflict