Toto.
Merge branch 'master' of https://github.com/Wambou/AirPolytech

Conflicts:
	src/Avion.h
	src/Billet.h
	src/Business.h
	src/Classe.h
	src/TypeClasse.h