Typos on 18
Merge pull request #65 from j0k3r/migrate_to_sf2_3

Typos on 18
Merge pull request #66 from shouze/migrate_to_sf2_3

Added 19
Add day 20, Elasticsearch with Symfony2
Merge branch 'migrate_to_sf2_3' into 20-elasticsearch

Conflicts:
	src/Afsy/Bundle/FrontBundle/Controller/AventController.php
Typo on 20 author bio
Merge pull request #68 from damienalexandre/20-elasticsearch

Day 20 - Elasticsearch in your Symfony2 app
fixed typo in bio
added title on top of the last article
Some minor fixes on the elasticsearch article
you'll write 1000 lines: I'll never commit a credential, password or key in a public repository
Merge pull request #69 from damienalexandre/20-typo-fix

Some minor fixes on the elasticsearch article
[21] Ajout de l'article
[21] Typo : paragraphe en double
Merge pull request #70 from Clem/migrate_to_sf2_3

[21] Ajout de l'article
[21] Fix routing
Merge remote-tracking branch 'origin/migrate_to_sf2_3' into migrate_to_sf2_3

* origin/migrate_to_sf2_3:
Merge pull request #71 from rjanot/migrate_to_sf2_3

DAY 21 : add routing
[21] Add images
Merge pull request #72 from rjanot/migrate_to_sf2_3

[21] Add images