Ajouter Tanaquil
Merge branch 'master' of github.com:tcobain/styleguide-workshop-2014 into tcobain-master

Conflicts:
	README.md