updating site
rebuilding site Wed May 14 16:41:22 PDT 2014
Update README.md
Update CNAME
Merge commit 'de97bab6ba6cc3adffc4114ef780892c55ec0a38' as 'public'
updating site
rebuilding site Wed May 14 16:41:22 PDT 2014
Merge commit '708c528c5d004772deb9a7f28591a7375de368f8' into sources

Conflicts:
	public/index.html
rebuilding site Wed May 14 18:44:35 PDT 2014
rebuilding site Wed May 14 18:45:15 PDT 2014