fixing css
fixed merge conflict
Merge pull request #29 from paopay/working

fixing css