palestrantes 2014
fix merge conflicts
Merge pull request #26 from brenoferreira/master

Palestrantes 2014