dsds
ofenzofn
ok
ejizofjnz
Merge branch 'master' of https://github.com/samszo/EvalEtu

Conflicts:
	CDNL1314/fairbrother_marc/cours_samuel/js_04.html
	CDNL1314/fairbrother_marc/cours_samuel/script.js