add douban (a Chinese social network) plugin support
Adding email badge, using the already existent "email" field on _config.yml
Merge pull request #51 from miguelgraz/gmail_badge

Adding email badge and icon
Merge pull request #52 from typd/master

add douban (a Chinese social network) plugin support
Vastly improved readability. Updated README screenshots too
Merge remote-tracking branch 'upstream/master'

Conflicts:
	source/_includes/header.html