refresh
Merge pull request #16 from jmigual/javascript

El barrejo i el tanco