Ajout de mon username github
Merge branch 'master' of github.com:joeyjody/styleguide-workshop-2014 into joeyjody-master

Conflicts:
	README.md