champs des juges pointages
Merge branch 'master' of https://github.com/palex1990/GTI350-LABO1

Conflicts:
	LAB1/LAB1/Base.lproj/Main.storyboard
test commit