Merge pull request #1 from steffen/gh-pages

Added my talk
Added Jean Carlos as co-organizer
Merge branch 'gh-pages' of github.com:barcelona-js/barcelonajs.org into gh-pages
Update index.html, history.html and iCal
hgroup fix
new oficial email address
added text for talk
Merge pull request #2 from spite/gh-pages

Submission for talk - WebGL & three.js
Talk proposal about Lungo.

Talk proposal about how to use Lungo (http://lungo.tapquo.com/) to quickly build HTML5 web apps.
Merge pull request #3 from gtorodelvalle/patch-1

Talk proposal about Lungo
Fixed link
Fixed CSS
Talk Proposal
Merge pull request #5 from javierbeaumont/gh-pages

Talk proposal about Games with jQuery
Updated sponsors and style
Merge branch 'gh-pages' of github.com:barcelona-js/barcelonajs.org into gh-pages
clean