updating site
rebuilding site Wed May 14 16:41:22 PDT 2014
Update README.md
Update CNAME
Merge commit 'ad9bcc0375fdc65c06b1c22714284fa6ccceb5c7' into sources

Conflicts:
	public/index.html