stupid js files
Merge branch 'master' into jcb
Merge pull request #19 from juanchel/jcb

Jcb