design lading pages
fix merging error
Merge pull request #443 from DonutWorks/feature/landing-page

design lading pages