Sincroniza cambios

Sincroniza cambios
Merge branch 'master' of https://github.com/RodolfoNepomuceno/Universidad

Conflicts:

MyApplication/app/src/main/java/com/example/rodolfo/universidad/Recinto1
.java
	MyApplication/app/src/main/res/layout/recinto1.xml