Merged commit from @isabelcabezasm with 2013 history
Merge branch 'master' of https://github.com/barcelona-js/barcelonajs.org
Merged commit from @isabelcabezasm with 2013 history