Tratamientos
Categoria
Merge branch 'master' of https://github.com/dbind/p4l6

Conflicts:
	Usuario.h