coucou2
Merge branch 'Yann' of https://github.com/roboticsEMN/Bracelet_NFC into Yann

Conflicts:
	testnfcpi/src/Code_test/AppTest.java