Merge branch 'master' of https://github.com/MatteoAdu/TecWeb

Conflicts:
css/style.css
Merge branch 'master' of https://github.com/MatteoAdu/TecWeb

Conflicts:
	css/style.css