Merge pull request #1 from emilyhilbig/gh-pages

add cname
/s/www//
Merge pull request #2 from emilyhilbig/master

Master