old
Conflicts solved
Merge branch 'fabio'

Conflicts:
	TP_Canvas.html
	images/lecadre3.jpg
	scripts.js
	style.css