Adicionando layout dias
Merge branch 'master' of https://github.com/NatanJMai/TrabalhoAndroid

Conflicts:
	bin/MateriasUFFS.apk
	bin/classes.dex
	bin/classes/br/edu/uffs/cc/MateriasUFFS/R$id.class
	bin/classes/br/edu/uffs/cc/MateriasUFFS/R$layout.class
	bin/classes/br/edu/uffs/cc/MateriasUFFS/R$menu.class
	bin/classes/br/edu/uffs/cc/MateriasUFFS/R$string.class
	bin/classes/br/edu/uffs/cc/MateriasUFFS/R$style.class
	bin/resources.ap_
	gen/br/edu/uffs/cc/MateriasUFFS/R.java