Merge branch 'master' of https://github.com/Lahkust/IFT339-TP1

Conflicts:
	dictionnaire.cpp