fase 2

...
Merge branch 'master' of https://github.com/richiramone/DivTools

Conflicts:
	css/main.css