Squashed 'public/' changes from 13fabef..ad9bcc0

ad9bcc0 Update CNAME
054cea9 Update README.md
7e0d9ec rebuilding site Wed May 14 16:41:22 PDT 2014
a136071 updating site

git-subtree-dir: public
git-subtree-split: ad9bcc0375fdc65c06b1c22714284fa6ccceb5c7
Merge commit '9aa7b07aa0160b12fe7da632cbb6768511643463' into sources

Conflicts:
	public/index.html