02/12

aplicação do header e footer em views
Merge remote-tracking branch 'origin/gr7' into gr7

Conflicts:
	public_html/css/css-c7.css
	public_html/modules/controllers/alunoController.class.php
	public_html/modules/views/aluno.php
	public_html/modules/views/professor.php