fix
Merge branch 'master' of https://github.com/marctrem/inf4230-3

Conflicts:
	src/ai-tp3-gtk.py