dah dah dah
Merge branch 'master' of https://github.com/JayceeZ/ProjetFinDeSemestre2014

Conflicts:
	Benedicte/src/view/graphic/Emprunts.java
debug de acahtMateriel
Merge branch 'master' of https://github.com/JayceeZ/ProjetFinDeSemestre2014