merge
Merge branch 'master' of https://github.com/T-800/Cours

Conflicts:
	L3/.DS_Store