pag home
pag perfil usuario
Merge branch 'sistema'

Conflicts:
	animal-aberto.php
	css/main.css
	favicon.ico
	html/js/main.js
	index.php
Merge branch 'master' into sistema