gravatar support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
	style.css
Merge remote-tracking branch 'upstream/master'