classe aluno criado
Merge branch 'master' of https://github.com/LeticiaLBarbosa/projeto-si1

Conflicts:
	conf/evolutions/default/1.sql