mudanças
ok
Merge branch 'master' of https://github.com/alancliff/SiteEndogenese

Conflicts:
	empresa/historia.html
	empresa/historia_old.html