Merge branch 'master' of github.com:objectkuan/objectkuan.github.io

Conflicts:
	public/css/hyde.css