my commit
Merge branch 'master' of https://github.com/Laetitia28/ProjetHisto3A

Conflicts:
	src/hg/histo/FramCell.java
	src/hg/histo/Main.java