Sun May 11 23:07:33 PDT 2014
Merge branch 'master' of https://github.com/hrp/hrp.github.io

Conflicts:
	CNAME