adicionado comentario
Merge branch 'master' of https://github.com/NatanJMai/TrabalhoAndroid

Conflicts:
	src/br/edu/uffs/cc/MateriasUFFS/Cadastro.java