Tumblr sharing

Signed-off-by: Laure Boutmy <laureboutmy@gmail.com>
GRR

Signed-off-by: Laure Boutmy <laureboutmy@gmail.com>
Merge branch 'master' of https://github.com/loupyestu/winter-is-coming

Signed-off-by: Laure Boutmy <laureboutmy@gmail.com>

Conflicts:
	video/assets/data/character-daenerystargaryen.html
	video/assets/images/content/28min2sec-marker.png
	video/assets/images/content/character-daenerystargaryen-timeline-png.png
	video/assets/images/content/character_daenerystargaryen-timeline-png.png