Merge branch 'master' of https://github.com/AresRobotic/Robot-2013-2014

Conflicts:
	cartes/Carte plan B/README.txt
	cartes/Carte_bouton/README.txt
	cartes/servo_shield/README.txt
	cartes/sharp_shield/README.txt
	cartes/sharp_shield/mini_board0.brd