Escribo un poco
Merge branch 'master' of https://nickrisaro@github.com/nickrisaro/MyReader.git

Conflicts:
	pom.xml