Merge pull request #1 from twitwi/master

mentioning that tasks are in the etherpad
Merge remote-tracking branch 'origin/gh-pages' into gh-pages