svg clock
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	_layouts/default.html
	img/hours_clock.svg