yet another fix
Merge branch 'master' of https://github.com/calmattoso/INF1771

Conflicts:
	T2/prolog.lua