MUERTE AL CLASSPATH
MUERTE A LOS CONFLICTOS
Merge branch 'master' of https://github.com/sharker86/Procuidado

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
Puto classpath