Mise à jour 16 janvier

Construction arbre marche
Merge branch 'second-branch' of https://github.com/alexcetto/pa1314 into second-branch

Conflicts:
	pa1314/affichage.cpp
	pa1314/importationArbre.cpp