Optimising images for middle earth
resolved conflict
added Japanese title and translator name
Merge pull request #829 from agektmr/kuu-ja/tutorials/memory/effectivemanagement

Japanese translation for "Effectively Managing Memory at Gmail scale"
Allowing json static files
Promises article. Fixes #446.
Merge pull request #830 from jakearchibald/master

Epic promises article
Automatically updating the calendar
NO ONE’S PERFECT
Merge pull request #831 from jakearchibald/master

Edits to promises article
Merge pull request #832 from html5rocks/master

Merge to live
Automatically updating the calendar
Images for 300ms update
Merge pull request #834 from jakearchibald/master

Images for 300ms update
Merge pull request #835 from html5rocks/master

Merging some images to live
Promises article update - don’t need flags in Canary for most of the examples
Merge pull request #836 from jakearchibald/master

Promises article update
Adds snow for showbiz
Minor tweaks for snow
Merge pull request #837 from html5rocks/master

Adds Promises article and SNOW!