Merge pull request #14 from adorableio/css

Css
clean up borders
Resolved conflict