style
last version
Merge branch 'master' of https://github.com/fabiop80/TP_Canvas

Conflicts:
	style.css