modifié:         SmellGalaxy/views.py
	modifié:         templates/SmellGalaxyTemplate/Graphes.html
Merge branch 'master' of https://github.com/JeanCoq/SmellGame

Conflicts:
	SmellGalaxy/fctGetDataHisto.py

	modifié:         SmellGalaxy/fctBoxPlot.py
	modifié:         SmellGalaxy/fctGetDataHisto.py