Test 3
Merge branch 'master' of https://github.com/MarK9992/Mini-projet-POO2

Conflicts:
	MiniProjet/src/model/equipment/IPad3.java
Merge branch 'master' of https://github.com/MarK9992/Mini-projet-POO2

Conflicts:
	MiniProjet/bin/model/equipment/IPad3.class
	MiniProjet/src/model/equipment/IPad3.java
Anana