o2 sat
Merge branch 'master' of https://github.com/bbaugnies/LINGI2263_g2

Conflicts:
	Projet_1/extract.py