[DIA 8]
Merge branch 'master' of https://github.com/ccaballero/javascript

asdf