Rainbow Dash best pony
Rarity best voyce acting
Rarity best voyce acting
Merge branch 'master' of github.com:Twixbadevil/tp-conduite-projet-2014 into Twixbadevil-master

Conflicts:
	README.md
Merge branch 'Twixbadevil-master'