Added scores and merged
Merge branch 'master' of
https://github.com/GFrenette-Lareault/TP2_Demineur.git

Conflicts:
	TP2_Demineur/TP2_Demineur/src/ca/csf/TP2_Demineur/MainWindowController.java