Changement
Merge branch 'master' of https://github.com/Canardou/ptut

Conflicts:
	Simulator 4/doc/allclasses-frame.html
	Simulator 4/doc/allclasses-noframe.html
	Simulator 4/doc/constant-values.html
	Simulator 4/doc/deprecated-list.html
	Simulator 4/doc/help-doc.html
	Simulator 4/doc/index-files/index-1.html
	Simulator 4/doc/index-files/index-2.html
	Simulator 4/doc/index-files/index-3.html
	Simulator 4/doc/index-files/index-4.html
	Simulator 4/doc/index-files/index-5.html
	Simulator 4/doc/index.html
	Simulator 4/doc/overview-tree.html
	Simulator 4/doc/package-list
	Simulator 4/src/communication/BluetoothCommPC2.java
	Simulator 4/src/communication/Trame2.java