tolti i bordi e cose varie
890j
Merge branch 'master' of https://github.com/MatteoAdu/TecWeb

Conflicts:
	css/style.css