lista de presentes
Merge branch 'master' of https://github.com/tecnologiane10/appassr

Conflicts:
	css/style.css
	js/jquery.maskMoney.js
	sistema/includes/inc.menu.php
	sistema/includes/inc.rodape.php
Merge branch 'master' of https://github.com/tecnologiane10/appassr