Merge pull request #1 from mcwic/master

first draft of site