tactile fonctionnelle
Merge branch 'master' of https://github.com/thomasNDS/PingPong_multimodalite

Conflicts:
	js/tactile.js