Updated to new version based on Hype and Jekyll.
Resolved a conflict.

Conflicts:
	CNAME
	index.html