Status e valor agregado lifestyle
Atualizacao final da madruga toddy
Back-end
Merge branch 'master' of https://github.com/juscelinotanaka/bdi

Conflicts:
	tp1/home.php