Added Henrique Bastos and Mattt Thompson
Added .gitignore
Merge pull request #8 from zaiste/gh-pages

Added Henrique Bastos and Mattt Thompson
Fix Speakers display when there is too much speakers to fit in one line
Merge pull request #9 from AdrienGiboire/gh-pages

Fix Speakers display when there is too much speakers to fit in one line
corrected links in the footer
5 new speakers
Add Favicon
Merge branch 'gh-pages' of git://github.com/albanlv/13.rupy.eu into albanlv-gh-pages

Conflicts:
	index.html
	stylesheets/main.css
Fix brochure link
Update CNAME
Merge branch 'gh-pages' of github.com:rupyconf/13.rupy.eu into gh-pages
Merge pull request #18 from albanlv/gh-pages

Recover
Merge branch 'gh-pages' of github.com:rupyconf/13.rupy.eu into gh-pages
Add PPCG as Partner
Merge pull request #19 from AdrienGiboire/gh-pages

Add PPCG as Partner