Merge remote-tracking branch 'origin/master'

Conflicts:
	dictionnaire.cpp
	obj/Debug/dictionnaire.o
	obj/Debug/tp1.o
Merge branch 'master' of https://github.com/Lahkust/IFT339-TP1

Conflicts:
	dictionnaire.cpp