no changes
commit files
Merge branch 'master' of https://github.com/Laetitia28/ProjetHisto3A

Conflicts:
	src/hg/hist/MVC/RequestFram.java