puto prop tt
Merge branch 'master' of https://github.com/alicenara/prop

Conflicts:
	src/propLlibreria/Interficie/VistaConsultes.java