create-drop
create-drop
create-drop
Merge origin/master

Conflicts:
	target/classes/DataSource.class
	target/classes/salias/Persona.class
	target/classes/salias/PersonaController.class
	target/stacktrace.log

manejo de pesonas tambn
manejo de pesonas tambn