Merge branch 'master' of https://github.com/gumartinm/JavaScriptForFun
authorgustavo <gu.martinm@gmail.com>
Sun, 11 Oct 2015 18:47:20 +0000 (20:47 +0200)
committergustavo <gu.martinm@gmail.com>
Sun, 11 Oct 2015 18:47:20 +0000 (20:47 +0200)

Trivial merge