<<<<<<< HEAD yo-alumno

En vez de Yo Robot

origin/master

Name		Name	Last commit message	Last commit date
Latest commit History 15 Commits
lib/unknown/binary/hibernate-jpa-2.1-api-1.0.0.Final/SNAPSHOT		lib/unknown/binary/hibernate-jpa-2.1-api-1.0.0.Final/SNAPSHOT
src/main		src/main
.gitignore		.gitignore
README.md		README.md
nb-configuration.xml		nb-configuration.xml
pom.xml		pom.xml