New proposal
4 Proposals with 2 speakers from Gigaspaces Uri Cohen and Nati Shalom
Merge pull request #237 from rberger/4ProposalsFromGigaspaces

4 Proposals with 2 speakers from Gigaspaces Uri Cohen and Nati Shalom
Merge pull request #236 from awolfs/master

New talk proposal
quotes will save you
Merge pull request #238 from drozer/master

quotes are needed in de proposals
Make the talks appear, like magic
Merge pull request #239 from awolfs/master

Fix missing talks
call for proposals and registration closed for Austin
Adding nyc 2013 (october)
Some strange mac thingy ate index.html. Re-created it.
Boy, did I fuck up the site by editing in TextEdit (for the Mac). Fixed it all, hopefully.
small formatting fixes.