new site design
Merge pull request #2 from cj123/master

Merge