Commit mfreville 1
Merge branch 'master' of https://github.com/Guilohm/TP-QSI

Conflicts:
	index.html