super commit, version compilable =)
Merge branch 'master' of github.com:epsiI4/ultimate

Conflicts:
	UltimateUltimate.depend
	bin/Debug/UltimateUltimate.exe
	obj/Debug/src/But.o
correction partiel frisbee