Renommer fxml et controlleur
Merge branch 'master' of https://github.com/fdelaney/TP1-Java.git

Conflicts:
	src/ca/csf/Travail_Pratique_1/Sample.fxml
	src/ca/csf/Travail_Pratique_1/SampleController.java