New landing page
Fix merge conflict
Merge pull request #81 from leeju/css-styling

Css styling